diff options
| author |   Tim Rozet <trozet@redhat.com> | 2017-02-16 21:41:10 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-02-16 21:41:10 +0000 |
| commit | 5e4c2ffc86d0426113f60b8069e81482f82bbc8d (patch) | |
| tree | a1b68df87725b16c25d1d8d9e10198ab001fae7f | |
| parent | c3077c777f3a5649e72fe20bfefa62b685f88653 (diff) | |
| parent | 3044900e61775ab01f90a1c40cac31e4212c7e45 (diff) | |
Merge "Adding Gluon to post-install and bumping version"
| -rwxr-xr-x | build/overcloud-opendaylight.sh | 2 | ||||
| -rwxr-xr-x | lib/post-install-functions.sh | 13 |
2 files changed, 14 insertions, 1 deletions
diff --git a/build/overcloud-opendaylight.sh b/build/overcloud-opendaylight.sh index def2bc4c..af745f18 100755 --- a/build/overcloud-opendaylight.sh +++ b/build/overcloud-opendaylight.sh @@ -95,7 +95,7 @@ LIBGUESTFS_BACKEND=direct virt-customize \ --run-command "cd /etc/puppet/modules/ && tar xzf puppet-gluon.tar.gz" \ --install epel-release \ --install python-click \ - --install http://artifacts.opnfv.org/netready/gluon-0.0.1-1_20170127.noarch.rpm \ + --install http://artifacts.opnfv.org/netready/gluon-0.0.1-1_20170216.noarch.rpm \ -a overcloud-full-opendaylight_build.qcow2 mv overcloud-full-opendaylight_build.qcow2 overcloud-full-opendaylight.qcow2 diff --git a/lib/post-install-functions.sh b/lib/post-install-functions.sh index e2d9327d..5ca91897 100755 --- a/lib/post-install-functions.sh +++ b/lib/post-install-functions.sh @@ -104,6 +104,12 @@ else 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) @@ -166,6 +172,13 @@ fi 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 |