neutron subnet-create --name external-net --tenant-id \$(openstack project show service | grep id | awk '{ print \$4 }') --disable-dhcp external --gateway ${admin_gateway} --allocation-pool start=${admin_introspection_range%%,*},end=${admin_introspection_range##*,} ${admin_cidr}
fi
+if [ "${deploy_options_array['gluon']}" == 'True' ]; then
+ echo "Creating Gluon dummy network and subnet"
+ neutron net-create --shared --provider:network_type vxlan GluonNetwork
+ neutron subnet-create --name GluonSubnet --no-gateway --disable-dhcp GluonNetwork 0.0.0.0/1
+fi
+
echo "Removing sahara endpoint and service"
sahara_service_id=\$(openstack service list | grep sahara | cut -d ' ' -f 2)
sahara_endpoint_id=\$(openstack endpoint list | grep sahara | cut -d ' ' -f 2)
EOI
+ # we need to restart neutron-server in Gluon deployments to allow the Gluon core
+ # plugin to correctly register itself with Neutron
+ if [ "${deploy_options_array['gluon']}" == 'True' ]; then
+ echo "Restarting neutron-server to finalize Gluon installation"
+ overcloud_connect "controller0" "sudo systemctl restart neutron-server"
+ fi
+
# for virtual, we NAT external network through Undercloud
# same goes for baremetal if only jumphost has external connectivity
if [ "$virtual" == "TRUE" ] || ! test_overcloud_connectivity && [ "$external_network_ipv6" != "True" ]; then
# 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
+
+if [ "${deploy_options_array['vpn']}" == 'True' ]; then
+ # Check zrpcd is started
+ overcloud_connect "controller0" "sudo systemctl status zrpcd > /dev/null || echo 'WARNING: zrpcd is not running on controller0'"
+fi
}