1. devstack
  2. Commit 42854dc87c326d84c1e5abbb678f24dcf25b8438
Browse code

Stop relying on the tempest sample config file

This commit stops using the sample config file as the base for tempest
configuration. The sample config isn't actually needed as a based for
configuration because all the options are commented out so from the
perspective of the config parser it's a blank file.

There are 2 reasons for making this change, first using the sample
like this creates a hard dependency on tempest having a sample config
file in tree. This is something that the project wants to change since
keeping the file in sync causes headaches because of new oslo
releases. The second aspect is that it makes the generated output
difficult to read. It includes *every* option and it's description in
the generated output which makes finding where devstack is actually
setting something more difficult to find.

Change-Id: I4064a041a965ed2419b68efc8dc31fce37b24cfd
(cherry picked from commit 93c10571e8b1b2c8e6916c759d5b92ab379c037f)

Matthew Treinish authored on 2015/07/31 23:38:50
Showing 1 changed files
lib/tempest
History View file @ 42854dc
... ... 
@@ -141,14 +141,13 @@ function configure_tempest {
141 141 
         esac
142 142 
     fi
143 143
144 
-    # Create tempest.conf from tempest.conf.sample
145 
-    # copy every time, because the image UUIDS are going to change
144 
+    # (Re)create ``tempest.conf``
145 
+    # Create every time because the image UUIDS are going to change
146 146 
     if [[ ! -d $TEMPEST_CONFIG_DIR ]]; then
147 147 
         sudo mkdir -p $TEMPEST_CONFIG_DIR
148 148 
     fi
149 149 
     sudo chown $STACK_USER $TEMPEST_CONFIG_DIR
150 
-    cp $TEMPEST_DIR/etc/tempest.conf.sample $TEMPEST_CONFIG
151 
-    chmod 644 $TEMPEST_CONFIG
150 
+    rm -f $TEMPEST_CONFIG
152 151
153 152 
     password=${ADMIN_PASSWORD:-secrete}
154 153