| commit | 219a58e57bfab5d8071e636399963bd31d9eca2a | [log] [tgz] |
|---|---|---|
| author | Jenkins <jenkins@review.openstack.org> | Fri Oct 31 13:28:54 2014 +0000 |
| committer | Gerrit Code Review <review@openstack.org> | Fri Oct 31 13:28:54 2014 +0000 |
| tree | 2330270433138aee249d43df99f4bda52a21bb00 | |
| parent | 956960e1b2c079eb5fe06fe9509522340fcd42a2 [diff] | |
| parent | 627ca74b51d68651a6cd042d83a0386713f15b39 [diff] |
Merge "[Sahara] Copy policy.json if it exists"
diff --git a/lib/sahara b/lib/sahara index 5c7c253..7f59cc1 100644 --- a/lib/sahara +++ b/lib/sahara
@@ -98,6 +98,10 @@ fi sudo chown $STACK_USER $SAHARA_CONF_DIR + if [[ -f $SAHARA_DIR/etc/sahara/policy.json ]]; then + 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