diff options
| -rwxr-xr-x | build/overcloud-full.sh | 1 | ||||
| -rwxr-xr-x | build/undercloud.sh | 4 | ||||
| -rwxr-xr-x | lib/virtual-setup-functions.sh | 2 |
3 files changed, 6 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/build/undercloud.sh b/build/undercloud.sh index d6c6c414..43884b16 100755 --- a/build/undercloud.sh +++ b/build/undercloud.sh @@ -62,6 +62,10 @@ LIBGUESTFS_BACKEND=direct virt-customize \ --run-command "sed -i '/^SERVICES/a\ \x27tacker\x27: {\x27description\x27: \x27Tacker Service\x27, \x27type\x27: \x27servicevm\x27, \x27path\x27: \x27/\x27, \x27port\x27: 1789 },' /usr/lib/python2.7/site-packages/os_cloud_config/keystone.py" \ --upload /tmp/tacker.repo:/etc/yum.repos.d/ \ --install "python-tackerclient" \ + --install "python2-aodhclient" \ + --install "openstack-heat-engine" \ + --install "openstack-heat-api-cfn" \ + --install "openstack-heat-api" \ -a undercloud_build.qcow2 # Add custom IPA to allow kernel params 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 |