diff options
| -rwxr-xr-x | build/overcloud-full.sh | 1 | ||||
| -rw-r--r-- | ci/PR_revision.log | 1 | ||||
| -rwxr-xr-x | lib/virtual-setup-functions.sh | 2 |
3 files changed, 3 insertions, 1 deletions
diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh index 6a72705a..a7d04eeb 100755 --- a/build/overcloud-full.sh +++ b/build/overcloud-full.sh @@ -140,6 +140,7 @@ LIBGUESTFS_BACKEND=direct virt-customize \ --upload puppet-tacker.tar.gz:/etc/puppet/modules/ \ --run-command "cd /etc/puppet/modules/ && tar xzf puppet-tacker.tar.gz" \ --run-command "yum install -y https://dl.dropboxusercontent.com/u/7079970/rabbitmq-server-3.6.3-5.el7ost.noarch.rpm" \ + --run-command "pip install python-senlinclient" \ -a overcloud-full_build.qcow2 mv -f overcloud-full_build.qcow2 overcloud-full.qcow2 diff --git a/ci/PR_revision.log b/ci/PR_revision.log index 5ff84dfc..5339f453 100644 --- a/ci/PR_revision.log +++ b/ci/PR_revision.log @@ -22,3 +22,4 @@ 52,Add notifier topic to ceilometer 53,Add numa to controller hiera hierarchy 54,fix network mtu +56,fixes tacker config for heat_uri diff --git a/lib/virtual-setup-functions.sh b/lib/virtual-setup-functions.sh index ed4d4dfd..abff25e4 100755 --- a/lib/virtual-setup-functions.sh +++ b/lib/virtual-setup-functions.sh @@ -45,7 +45,7 @@ EOF VM_COMPUTES=$((VM_COMPUTES - 1)) else capability="profile:control" - if [[ "${deploy_options_array['sdn_controller']}" == 'opendaylight' && "$ha_enabled" == "True" && "$ramsize" -lt 10240 ]]; then + if [[ "${deploy_options_array['sdn_controller']}" == 'opendaylight' && "$ramsize" -lt 10240 ]]; then echo "WARN: RAM per controller too low. OpenDaylight specified in HA deployment requires at least 10GB" echo "INFO: Increasing RAM per controller to 10GB" ramsize=10240 |