diff options
| -rw-r--r-- | build/opnfv-environment.yaml | 5 | ||||
| -rw-r--r-- | ci/PR_revision.log | 3 | ||||
| -rwxr-xr-x | lib/post-install-functions.sh | 8 |
3 files changed, 15 insertions, 1 deletions
diff --git a/build/opnfv-environment.yaml b/build/opnfv-environment.yaml index 54b1e6f2..7a3ae739 100644 --- a/build/opnfv-environment.yaml +++ b/build/opnfv-environment.yaml @@ -8,3 +8,8 @@ parameters: EnableSahara: false ExtraConfig: tripleo::ringbuilder::build_ring: False + nova::policy::policies: + nova-os_compute_api:servers:show:host_status: + key: 'os_compute_api:servers:show:host_status' + value: 'rule:admin_or_owner' + diff --git a/ci/PR_revision.log b/ci/PR_revision.log index ed86012d..de62cb6b 100644 --- a/ci/PR_revision.log +++ b/ci/PR_revision.log @@ -10,4 +10,5 @@ 26,Fixes ODL ML2 IP 30,Adds OVS DPDK config 33,Removes QOS service plugin from Neutron -35,Use nic1 as control plane inteface name instead of default br-ex
\ No newline at end of file +35,Use nic1 as control plane inteface name instead of default br-ex +38,Fixes nova default floating pool to be 'external' diff --git a/lib/post-install-functions.sh b/lib/post-install-functions.sh index e1f121b9..912a2a11 100755 --- a/lib/post-install-functions.sh +++ b/lib/post-install-functions.sh @@ -64,6 +64,14 @@ EOI done fi + # TODO fix this when HA SDN controllers are supported + if [ "${deploy_options_array['sdn_controller']}" != 'False' ]; then + echo -e "${blue}INFO: Finding SDN Controller IP for overcloudrc...${reset}" + sdn_controller_ip=$(overcloud_connect controller0 "facter ipaddress_br_ex") + echo -e "${blue}INFO: SDN Controller IP is ${sdn_controller_ip} ${reset}" + undercloud_connect stack "echo 'export SDN_CONTROLLER_IP=${sdn_controller_ip}' >> /home/stack/overcloudrc" + fi + ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI source overcloudrc set -o errexit |