Browse code

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

Jenkins authored on 2015/03/19 02:48:22
Showing 1 changed files
... ...
@@ -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