diff options
| author |   Tim Rozet <trozet@redhat.com> | 2017-05-13 02:45:07 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-05-13 02:45:07 +0000 |
| commit | 2f1a9dc491f55b5890a030a8ee36faa15de57b9e (patch) | |
| tree | 9938039b26d8ce0fbd5fc9456b594d3ebcaa7aa6 | |
| parent | b63857ee231134fe9af6c5667d40a8f4f2b8555d (diff) | |
| parent | bb23cfe3dbf112d7cffdbec2c7937492aecfe36b (diff) | |
Merge "Couple cleanups related to ocata update"
| -rwxr-xr-x | build/overcloud-opendaylight.sh | 5 | ||||
| -rwxr-xr-x | lib/undercloud-functions.sh | 7 |
2 files changed, 0 insertions, 12 deletions
diff --git a/build/overcloud-opendaylight.sh b/build/overcloud-opendaylight.sh index bacf5360..35d9bac3 100755 --- a/build/overcloud-opendaylight.sh +++ b/build/overcloud-opendaylight.sh @@ -89,10 +89,5 @@ LIBGUESTFS_BACKEND=direct virt-customize \ --upload ${CACHE_DIR}/odl-netvirt-vpp-distribution.tar.gz:/root/ \ -a overcloud-full-opendaylight_build.qcow2 - # TODO: Put bgpvpn back into the build - #--upload ${BUILD_DIR}/networking-bgpvpn.tar.gz:/root/ \ - #--run-command "cd /root/ && tar xzf networking-bgpvpn.tar.gz && yum localinstall -y *networking-bgpvpn*.rpm" \ - #--run-command "rm -f /etc/neutron/networking_bgpvpn.conf" \ - #--run-command "touch /etc/neutron/networking_bgpvpn.conf" \ LIBGUESTFS_BACKEND=direct virt-sparsify --compress overcloud-full-opendaylight_build.qcow2 overcloud-full-opendaylight.qcow2 popd > /dev/null diff --git a/lib/undercloud-functions.sh b/lib/undercloud-functions.sh index a17036ac..d324b0b8 100755 --- a/lib/undercloud-functions.sh +++ b/lib/undercloud-functions.sh @@ -196,13 +196,6 @@ sudo sed -i '/CephClusterFSID:/c\\ CephClusterFSID: \\x27$(cat /proc/sys/kernel sudo sed -i '/CephMonKey:/c\\ CephMonKey: \\x27'"\$(ceph-authtool --gen-print-key)"'\\x27' /usr/share/openstack-tripleo-heat-templates/environments/storage-environment.yaml sudo sed -i '/CephAdminKey:/c\\ CephAdminKey: \\x27'"\$(ceph-authtool --gen-print-key)"'\\x27' /usr/share/openstack-tripleo-heat-templates/environments/storage-environment.yaml -##### -# TEMP WORKAROUND, REMOVE WHEN SNAPS SUPPORTS GLANCE API v2 -# JIRA: SNAPS-66 -##### -sudo sed -i '/glance::api::enable_v1_api/ s/false/true/' -i /usr/share/openstack-tripleo-heat-templates/puppet/services/glance-api.yaml - - openstack undercloud install &> apex-undercloud-install.log || { # cat the undercloud install log incase it fails echo "ERROR: openstack undercloud install has failed. Dumping Log:" |