diff options
| author |   Tim Rozet <trozet@redhat.com> | 2017-02-16 15:59:41 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-02-16 15:59:41 +0000 |
| commit | 0658df1604d3f5a7042478104778ba7e9d233a3e (patch) | |
| tree | 9a1c66104163337bfd9959984308e7e695d76609 /build/undercloud.sh | |
| parent | f7d9228f84649ace479e34e81b17248593fdad95 (diff) | |
| parent | 66386e48403de6c04902ee01cf38c402be02c05e (diff) | |
Merge "Adding tacker support back into Danube"
Diffstat (limited to 'build/undercloud.sh')
| -rwxr-xr-x | build/undercloud.sh | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/build/undercloud.sh b/build/undercloud.sh index e7f4c07b..b27b9108 100755 --- a/build/undercloud.sh +++ b/build/undercloud.sh @@ -34,7 +34,7 @@ python3 -c 'import py_compile; py_compile.compile("image.py", cfile="image.pyc") # seeding configuration files specific to OPNFV # add congress client # add congress password to python-tripleoclient -# add tacker password to python-tripleoclient +# add tacker password to tripleo-common # upload tacker repo and install the client package # Add performance image scripts # hack for disabling undercloud package update @@ -58,10 +58,7 @@ LIBGUESTFS_BACKEND=direct virt-customize \ --run-command "sed -i '/PASSWORD_NAMES =/a\\ \"OVERCLOUD_CONGRESS_PASSWORD\",' /usr/lib/python2.7/site-packages/tripleoclient/utils.py" \ --run-command "sed -i '/AodhPassword/a\\ parameters\[\x27CongressPassword\x27\] = passwords\[\x27OVERCLOUD_CONGRESS_PASSWORD\x27\]' /usr/lib/python2.7/site-packages/tripleoclient/v1/overcloud_deploy.py" \ --run-command "sed -i '/^SERVICES/a\ \x27congress\x27: {\x27description\x27: \x27Congress Service\x27, \x27type\x27: \x27policy\x27, \x27path\x27: \x27/\x27, \x27port\x27: 1789 },' /usr/lib/python2.7/site-packages/os_cloud_config/keystone.py" \ - --run-command "sed -i '/SERVICE_LIST/a\\ \x27tacker\x27: {\x27password_field\x27: \x27OVERCLOUD_TACKER_PASSWORD\x27},' /usr/lib/python2.7/site-packages/tripleoclient/constants.py" \ - --run-command "sed -i '/PASSWORD_NAMES =/a\\ \"OVERCLOUD_TACKER_PASSWORD\",' /usr/lib/python2.7/site-packages/tripleoclient/utils.py" \ - --run-command "sed -i '/AodhPassword/a\\ parameters\[\x27TackerPassword\x27\] = passwords\[\x27OVERCLOUD_TACKER_PASSWORD\x27\]' /usr/lib/python2.7/site-packages/tripleoclient/v1/overcloud_deploy.py" \ - --run-command "sed -i '/^SERVICES/a\ \x27tacker\x27: {\x27description\x27: \x27Tacker Service\x27, \x27type\x27: \x27servicevm\x27, \x27path\x27: \x27/\x27, \x27port\x27: 8888 },' /usr/lib/python2.7/site-packages/os_cloud_config/keystone.py" \ + --run-command "sed -i '/SwiftPassword/a\ \x27TackerPassword\x27,' /usr/lib/python2.7/site-packages/tripleo_common/constants.py" \ --upload ${BUILD_DIR}/noarch/$tackerclient_pkg:/root/ \ --install /root/$tackerclient_pkg \ --install "python2-aodhclient" \ |