Merge "Fix tacker"

diff --git a/build/opnfv-environment.yaml b/build/opnfv-environment.yaml
index 61915c9..7a723f5 100644 (file)
--- 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 ef922a0..839fdfb 100755 (executable)
--- 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 14c3724..e3fdc65 100755 (executable)
--- 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