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

Matthew Treinish authored on 2015/07/31 23:38:50
Showing 1 changed files
... ...
@@ -167,10 +167,10 @@ function configure_tempest {
167 167
         esac
168 168
     fi
169 169
 
170
-    # Create ``tempest.conf`` from ``tempest.conf.sample``
171
-    # Copy every time because the image UUIDS are going to change
170
+    # (Re)create ``tempest.conf``
171
+    # Create every time because the image UUIDS are going to change
172 172
     sudo install -d -o $STACK_USER $TEMPEST_CONFIG_DIR
173
-    install -m 644 $TEMPEST_DIR/etc/tempest.conf.sample $TEMPEST_CONFIG
173
+    rm -f $TEMPEST_CONFIG
174 174
 
175 175
     password=${ADMIN_PASSWORD:-secrete}
176 176