1. devstack
  2. Commit 302389bf8d1d9dfeed9a7c07e8bb4b85fc731028
Browse code

[SAHARA] Remove copying sahara.conf from base config file

Sahara is going to remove sahara.conf.sample because it
is not gated anymore and therefore it gets out of date.
So, we need to remove copying sahara.conf from base config file
sahara.conf.sample

Change-Id: I0ddf36cfc15694dfe41fe695d577199da75ce7f1

Vitaly Gridnev authored on 2015/03/12 20:15:44
Showing 1 changed files
lib/sahara
History View file @ 302389b
... ... 
@@ -111,9 +111,6 @@ function configure_sahara {
111 111 
         cp -p $SAHARA_DIR/etc/sahara/policy.json $SAHARA_CONF_DIR
112 112 
     fi
113 113
114 
-    # Copy over sahara configuration file and configure common parameters.
115 
-    cp $SAHARA_DIR/etc/sahara/sahara.conf.sample $SAHARA_CONF_FILE
116 
-
117 114 
     # Create auth cache dir
118 115 
     sudo mkdir -p $SAHARA_AUTH_CACHE_DIR
119 116 
     sudo chown $STACK_USER $SAHARA_AUTH_CACHE_DIR