diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-10-31 16:02:45 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-10-31 16:02:45 +0000 |
| commit | 4ab45dddc0f2e84250d5d2dfd8eadba17ac03661 (patch) | |
| tree | 6152e694751f6f78f7b199aed4e9f944efb764da /mcp/reclass | |
| parent | 66041473fa5b1a539b8a1fd5b98cf2e94f9fbf49 (diff) | |
| parent | 36d842cd4938d97d6cd16b3fafe4740aaa4f288e (diff) | |
Merge "Add odl bgpvpn noha scenario to fuel" into stable/gambia
Diffstat (limited to 'mcp/reclass')
3 files changed, 17 insertions, 0 deletions
diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j2 index 2f7e39d87..6d09541a4 100644 --- a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j2 @@ -183,6 +183,11 @@ parameters: global_physnet_mtu: 9000 backend: external_mtu: 9000 +{%- if '-bgpvpn-' in conf.MCP_DEPLOY_SCENARIO %} + bgp_vpn: + enabled: True + driver: opendaylight_v2 +{%- endif %} apache: server: bind: diff --git a/mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control.yml.j2 b/mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control.yml.j2 index d905f7ad6..92abf9d8f 100644 --- a/mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control.yml.j2 @@ -10,6 +10,7 @@ classes: - system.linux.system.repo.mcp.openstack - system.linux.system.repo.mcp.extra - service.opendaylight.server.single + - service.quagga.server.single - cluster.mcp-odl-noha - cluster.mcp-odl-noha.opendaylight.control_pdf parameters: diff --git a/mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control_pdf.yml.j2 b/mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control_pdf.yml.j2 index 5e647d0c0..95f3ee385 100644 --- a/mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control_pdf.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control_pdf.yml.j2 @@ -27,6 +27,17 @@ parameters: gateway: {{ nm.net_admin_gw }} name_servers: - {{ nm.net_admin_gw }} +{%- if '-bgpvpn-' in conf.MCP_DEPLOY_SCENARIO %} + external: + enabled: true + name: {{ nm.ctl01.nic_public }} + proto: static + type: eth + address: ${_param:opnfv_opendaylight_server_external_address} + netmask: ${_param:opnfv_net_public_mask} + mtu: ${_param:interface_mtu} + noifupdown: true +{%- endif %} {#- prevent duplicates for tagged mgmt on the same physical interface as PXE/admin #} {%- if nm.ctl01.nic_admin in nics %} |