Browse code

Merge "Use sahara.conf.sample instead of old one"

Jenkins authored on 2014/03/21 12:56:56
Showing 1 changed files
... ...
@@ -102,8 +102,7 @@ function configure_sahara {
102 102
     sudo chown $STACK_USER $SAHARA_CONF_DIR
103 103
 
104 104
     # Copy over sahara configuration file and configure common parameters.
105
-    # TODO(slukjanov): rename when sahara internals will be updated
106
-    cp $SAHARA_DIR/etc/savanna/savanna.conf.sample $SAHARA_CONF_FILE
105
+    cp $SAHARA_DIR/etc/sahara/sahara.conf.sample $SAHARA_CONF_FILE
107 106
 
108 107
     # Create auth cache dir
109 108
     sudo mkdir -p $SAHARA_AUTH_CACHE_DIR