Browse code

Merge "Remove the sample configuration file for keystone"

Zuul authored on 2018/04/23 19:44:57
Showing 1 changed files
... ...
@@ -202,7 +202,7 @@ function configure_keystone {
202 202
     sudo install -d -o $STACK_USER $KEYSTONE_CONF_DIR
203 203
 
204 204
     if [[ "$KEYSTONE_CONF_DIR" != "$KEYSTONE_DIR/etc" ]]; then
205
-        install -m 600 $KEYSTONE_DIR/etc/keystone.conf.sample $KEYSTONE_CONF
205
+        install -m 600 /dev/null $KEYSTONE_CONF
206 206
         if [[ -f "$KEYSTONE_DIR/etc/keystone-paste.ini" ]]; then
207 207
             cp -p "$KEYSTONE_DIR/etc/keystone-paste.ini" "$KEYSTONE_PASTE_INI"
208 208
         fi
... ...
@@ -220,7 +220,7 @@ function configure_keystone {
220 220
         inidelete $KEYSTONE_PASTE_INI composite:admin \\/v2.0
221 221
     fi
222 222
 
223
-    # Rewrite stock ``keystone.conf``
223
+    # Populate ``keystone.conf``
224 224
     if is_service_enabled ldap; then
225 225
         iniset $KEYSTONE_CONF identity domain_config_dir "$KEYSTONE_CONF_DIR/domains"
226 226
         iniset $KEYSTONE_CONF identity domain_specific_drivers_enabled "True"