summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2016-07-24 13:09:00 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-07-24 13:09:00 +0000
commitd2eeee6cb797092ecd9ffbe22fac7b8f09314b5e (patch)
treef1eebb90d4885ce5f0a336e6389764d29a5f4659
parente42b3b06dd15d71844fc7fc85a69459d4aa4fc65 (diff)
parent6aa8f4716bac87e82f2a635474e31c883dd0cbb4 (diff)
Merge "Fix tacker"
-rw-r--r--build/opnfv-environment.yaml2
-rwxr-xr-xbuild/overcloud-full.sh3
-rwxr-xr-xlib/overcloud-deploy-functions.sh4
3 files changed, 5 insertions, 4 deletions
diff --git a/build/opnfv-environment.yaml b/build/opnfv-environment.yaml
index 61915c96..7a723f54 100644
--- a/build/opnfv-environment.yaml
+++ b/build/opnfv-environment.yaml
@@ -8,7 +8,7 @@ parameters:
ControllerEnableSwiftStorage: false
# CloudDomain:
EnableSahara: false
- EnableTacker: false
+ EnableTacker: true
ExtraConfig:
tripleo::ringbuilder::build_ring: False
nova::policy::policies:
diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh
index ef922a07..839fdfb4 100755
--- a/build/overcloud-full.sh
+++ b/build/overcloud-full.sh
@@ -89,7 +89,8 @@ tar czf vsperf.tar.gz vsperf
# tar up the tacker puppet module
rm -rf puppet-tacker
-git clone https://github.com/radez/puppet-tacker
+# TODO move this back to radez puppet-tacker after PR is accepted
+git clone -b fix_db_sync https://github.com/trozet/puppet-tacker
pushd puppet-tacker > /dev/null
git archive --format=tar.gz --prefix=tacker/ HEAD > ../puppet-tacker.tar.gz
popd > /dev/null
diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh
index 14c37247..e3fdc65f 100755
--- a/lib/overcloud-deploy-functions.sh
+++ b/lib/overcloud-deploy-functions.sh
@@ -199,8 +199,8 @@ if [ "$debug" == 'TRUE' ]; then
LIBGUESTFS_BACKEND=direct virt-customize -a overcloud-full.qcow2 --root-password password:opnfvapex
fi
-if [ "${deploy_options_array['tacker']}" == 'True' ]; then
- sed -i '/EnableTacker/\\c EnableTacker: true' opnfv-environment.yaml
+if [ "${deploy_options_array['tacker']}" == 'False' ]; then
+ sed -i '/EnableTacker:/c\ EnableTacker: false' opnfv-environment.yaml
fi
source stackrc