summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rwxr-xr-xlib/overcloud-deploy-functions.sh3
-rwxr-xr-xlib/post-install-functions.sh2
2 files changed, 5 insertions, 0 deletions
diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh
index 1127f049..30fd5e66 100755
--- a/lib/overcloud-deploy-functions.sh
+++ b/lib/overcloud-deploy-functions.sh
@@ -97,6 +97,9 @@ EOF
if [ "${deploy_options_array['dataplane']}" == 'fdio' ]; then
sudo sed -i '/FdioEnabled:/c\ FdioEnabled: true' /usr/share/openstack-tripleo-heat-templates/environments/numa.yaml
+ LIBGUESTFS_BACKEND=direct virt-customize --run-command "cp -f /root/fdio_neutron_l3/namespaces.py /usr/lib/python2.7/site-packages/neutron/agent/l3/" \
+ --run-command "cp -f /root/fdio_neutron_l3/router_info.py /usr/lib/python2.7/site-packages/neutron/agent/l3/" \
+ -a overcloud-full.qcow2
if [ "${deploy_options_array['sdn_controller']}" == 'opendaylight' ]; then
LIBGUESTFS_BACKEND=direct virt-customize --run-command "cd /root/ && tar zxvf networking-odl.tar.gz" \
--run-command "cd /root/networking-odl && git init && pip install -r requirements.txt" \
diff --git a/lib/post-install-functions.sh b/lib/post-install-functions.sh
index 6e9859a8..a23e0877 100755
--- a/lib/post-install-functions.sh
+++ b/lib/post-install-functions.sh
@@ -209,5 +209,7 @@ if [[ "$ha_enabled" == 'True' ]]; then
echo "${blue}\nChecking pacemaker service status\n${reset}"
fi
overcloud_connect "controller0" "for i in \$(sudo pcs status | grep '^* ' | cut -d ' ' -f 2 | cut -d '_' -f 1 | uniq); do echo \"WARNING: Service: \$i not running\"; done"
+ # trozet disable congress in HA until congress bugs are fixed
+ overcloud_connect "controller0" "sudo pcs resource ban openstack-congress overcloud-controller-1; sudo pcs resource ban openstack-congress overcloud-controller-2; sudo systemctl restart openstack-congress"
fi
}