diff options
| author |   Michael Chapman <michapma@redhat.com> | 2016-07-21 17:36:09 -0400 |
|---|---|---|
| committer |   Tim Rozet <trozet@redhat.com> | 2016-07-22 15:59:13 -0400 |
| commit | 6aa8f4716bac87e82f2a635474e31c883dd0cbb4 (patch) | |
| tree | 88eb56a1385a6a29b5e7e542df1fbafa86ff55c1 | |
| parent | 66f4a30987f870d5a6416b2c46c7dfb95130b4d9 (diff) | |
Fix tacker
opnfv-tht-pr: 49
JIRA: APEX-210
Change-Id: I9ed97588e8ae70d8ded6d2939c6a62d38393d8de
Signed-off-by: Michael Chapman <michapma@redhat.com>
Signed-off-by: Tim Rozet <trozet@redhat.com>
| -rw-r--r-- | build/opnfv-environment.yaml | 2 | ||||
| -rwxr-xr-x | build/overcloud-full.sh | 3 | ||||
| -rwxr-xr-x | lib/overcloud-deploy-functions.sh | 4 |
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 7eb22d1d..e9930fa5 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 |