diff options
| author |   Tim Rozet <trozet@redhat.com> | 2016-11-18 12:46:11 -0500 |
|---|---|---|
| committer | Tim Rozet <trozet@redhat.com> | 2016-11-18 14:47:27 -0500 |
| commit | 345b49b9b7c374c81296f5f371d2d360db337fb9 (patch) | |
| tree | e13bd210ffa127f998a953785cce5b05b20dd1c2 | |
| parent | 544894c3bc802fa107cb9d4de61a9f5c42869d39 (diff) | |
Fixes external network creation
Without specifying the provider network type or physical network results
in the default tenant network type being used upon external network
creation (for us this means vxlan). Previously this worked fine because
Neutron L3 agent and ODL L3 would assume to use br-ex. This is no
longer true in ODL new nettvirt, and needs to be explicitly flat along
with the correct physical network.
Also includes minor fix for Manila service naming that was fixed
upstream.
JIRA: APEX-300
Change-Id: If5d467a811baafe01b725dd530938482fdd3fd03
Signed-off-by: Tim Rozet <trozet@redhat.com>
| -rw-r--r-- | build/opnfv-environment.yaml | 12 | ||||
| -rwxr-xr-x | lib/post-install-functions.sh | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/build/opnfv-environment.yaml b/build/opnfv-environment.yaml index f45ad699..ff6fd6af 100644 --- a/build/opnfv-environment.yaml +++ b/build/opnfv-environment.yaml @@ -79,12 +79,12 @@ parameter_defaults: - OS::TripleO::Services::GnocchiApi - OS::TripleO::Services::GnocchiMetricd - OS::TripleO::Services::GnocchiStatsd - - OS::Tripleo::Services::ManilaApi - - OS::Tripleo::Services::ManilaScheduler - - OS::Tripleo::Services::ManilaBackendGeneric - - OS::Tripleo::Services::ManilaBackendNetapp - - OS::Tripleo::Services::ManilaBackendCephFs - - OS::Tripleo::Services::ManilaShare + - OS::TripleO::Services::ManilaApi + - OS::TripleO::Services::ManilaScheduler + - OS::TripleO::Services::ManilaBackendGeneric + - OS::TripleO::Services::ManilaBackendNetapp + - OS::TripleO::Services::ManilaBackendCephFs + - OS::TripleO::Services::ManilaShare - OS::TripleO::Services::AodhApi - OS::TripleO::Services::AodhEvaluator - OS::TripleO::Services::AodhNotifier diff --git a/lib/post-install-functions.sh b/lib/post-install-functions.sh index 604eb70d..d396f8bf 100755 --- a/lib/post-install-functions.sh +++ b/lib/post-install-functions.sh @@ -90,7 +90,7 @@ echo "Configuring Neutron external network" if [[ -n "$external_nic_mapping_compute_vlan" && "$external_nic_mapping_compute_vlan" != 'native' ]]; then neutron net-create external --router:external=True --tenant-id \$(openstack project show service | grep id | awk '{ print \$4 }') --provider:network_type vlan --provider:segmentation_id ${external_nic_mapping_compute_vlan} --provider:physical_network datacentre else - neutron net-create external --router:external=True --tenant-id \$(openstack project show service | grep id | awk '{ print \$4 }') + neutron net-create external --router:external=True --tenant-id \$(openstack project show service | grep id | awk '{ print \$4 }') --provider:network_type flat --provider:physical_network datacentre fi if [ "$external_network_ipv6" == "True" ]; then neutron subnet-create --name external-net --tenant-id \$(openstack project show service | grep id | awk '{ print \$4 }') external --ip_version 6 --ipv6_ra_mode slaac --ipv6_address_mode slaac --gateway ${external_gateway} --allocation-pool start=${external_floating_ip_range%%,*},end=${external_floating_ip_range##*,} ${external_cidr} |