| commit | 6ec715ea6703d69643a6dd1e92cc9ebac4dc49e6 | [log] [tgz] |
|---|---|---|
| author | Jenkins <jenkins@review.openstack.org> | Wed Mar 18 17:48:22 2015 +0000 |
| committer | Gerrit Code Review <review@openstack.org> | Wed Mar 18 17:48:22 2015 +0000 |
| tree | 4883ba7aa969367e3f4006ea6bd410e4767a4c04 | |
| parent | e634a96997732690f18c4993afac15a29750c0a2 [diff] | |
| parent | 302389bf8d1d9dfeed9a7c07e8bb4b85fc731028 [diff] |
Merge "[SAHARA] Remove copying sahara.conf from base config file"
diff --git a/lib/sahara b/lib/sahara index 521b19a..709e90e 100644 --- a/lib/sahara +++ b/lib/sahara
@@ -111,9 +111,6 @@ cp -p $SAHARA_DIR/etc/sahara/policy.json $SAHARA_CONF_DIR fi - # Copy over sahara configuration file and configure common parameters. - cp $SAHARA_DIR/etc/sahara/sahara.conf.sample $SAHARA_CONF_FILE - # Create auth cache dir sudo mkdir -p $SAHARA_AUTH_CACHE_DIR sudo chown $STACK_USER $SAHARA_AUTH_CACHE_DIR