diff options
| author |   Tim Rozet <trozet@redhat.com> | 2018-07-20 00:24:47 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-07-20 00:24:47 +0000 |
| commit | 82a9bec67b094f6381acb035a9efeffe47b011ab (patch) | |
| tree | eb300e2d526b919f2eb0953e3a4a61cf285d4496 /build | |
| parent | 48d1c6885afe72c92d07204cdfc97829ce9d24ed (diff) | |
| parent | 8bc7bd15dcb170f3c37dfe0358dcdf7f9189b2ba (diff) | |
Merge "Add tenant vlan support"
Diffstat (limited to 'build')
| -rw-r--r-- | build/nics-template.yaml.jinja2 | 12 | ||||
| -rw-r--r-- | build/rpm_specs/opnfv-apex.spec | 3 | ||||
| -rw-r--r-- | build/upstream-environment.yaml | 5 |
3 files changed, 19 insertions, 1 deletions
diff --git a/build/nics-template.yaml.jinja2 b/build/nics-template.yaml.jinja2 index 073d6680..11e0b115 100644 --- a/build/nics-template.yaml.jinja2 +++ b/build/nics-template.yaml.jinja2 @@ -190,6 +190,18 @@ resources: name: {{ nets['tenant']['nic_mapping'][role]['members'][0] }} # force the MAC address of the bridge to this interface primary: true + {%- elif nets['tenant']['segmentation_type'] == 'vlan' %} + type: ovs_bridge + name: br-vlan + use_dhcp: false + addresses: + - + ip_netmask: {get_param: TenantIpSubnet} + members: + - + type: interface + name: {{ nets['tenant']['nic_mapping'][role]['members'][0] }} + primary: true {%- else %} - type: {{ nets['tenant']['nic_mapping'][role]['phys_type'] }} diff --git a/build/rpm_specs/opnfv-apex.spec b/build/rpm_specs/opnfv-apex.spec index 4f9d98fb..c6bb5308 100644 --- a/build/rpm_specs/opnfv-apex.spec +++ b/build/rpm_specs/opnfv-apex.spec @@ -112,6 +112,7 @@ install config/inventory/pod_example_settings.yaml %{buildroot}%{_docdir}/opnfv/ %{_sysconfdir}/opnfv-apex/network_settings_vlans.yaml %{_sysconfdir}/opnfv-apex/network_settings_v6.yaml %{_sysconfdir}/opnfv-apex/k8s-nosdn-nofeature-noha.yaml +%{_sysconfdir}/opnfv-apex/network_settings_tenant_vlan.yaml %doc %{_docdir}/opnfv/LICENSE.rst %doc %{_docdir}/opnfv/installation-instructions.html %doc %{_docdir}/opnfv/release-notes.rst @@ -122,6 +123,8 @@ install config/inventory/pod_example_settings.yaml %{buildroot}%{_docdir}/opnfv/ %doc %{_docdir}/opnfv/inventory.yaml.example %changelog +* Wed Jun 27 2018 Feng Pan <fpan@redhat.com> -7.0-4 + Adds network_settings_tenant_vlan.yaml * Wed Jun 20 2018 Zenghui Shi <zshi@redhat.com> - 7.0-3 Adds Kubernetes deployment scenario * Fri Jun 15 2018 Tim Rozet <trozet@redhat.com> - 7.0-2 diff --git a/build/upstream-environment.yaml b/build/upstream-environment.yaml index debe6f3a..2d037c38 100644 --- a/build/upstream-environment.yaml +++ b/build/upstream-environment.yaml @@ -7,7 +7,10 @@ parameters: parameter_defaults: DockerPuppetProcessCount: 10 - NeutronNetworkVLANRanges: 'datacentre:500:525' + #NeutronNetworkVLANRanges: 'datacentre:500:525' + #NeutronBridgeMappings: "datacentre:br-ex" + #OpenDaylightProviderMappings: "datacentre:br-ex" + NeutronNetworkType: vxlan SshServerOptions: HostKey: - '/etc/ssh/ssh_host_rsa_key' |