diff options
Diffstat (limited to 'mcp/reclass/classes/cluster/mcp-common-noha')
| -rw-r--r-- | mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute.yml | 1 | ||||
| -rw-r--r-- | mcp/reclass/classes/cluster/mcp-common-noha/openstack_gateway_pdf.yml.j2 | 30 |
2 files changed, 11 insertions, 20 deletions
diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute.yml b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute.yml index 671f6eb07..bfa46ac5c 100644 --- a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute.yml +++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute.yml @@ -21,7 +21,6 @@ parameters: _param: interface_mtu: 9000 linux_system_codename: xenial - single_address: ${_param:control_address} nova: compute: libvirt_service: libvirtd diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_gateway_pdf.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_gateway_pdf.yml.j2 index 6bd61a2d4..4f22d4fa2 100644 --- a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_gateway_pdf.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_gateway_pdf.yml.j2 @@ -39,15 +39,22 @@ parameters: external_interface: enabled: true name: ${_param:external_interface} - mtu: ${_param:interface_mtu} proto: manual - type: eth - gateway: ${_param:opnfv_net_public_gw} - name_servers: {{ nm.dns_public }} + ovs_port_type: OVSPort + type: ovs_port + ovs_bridge: br-floating + bridge: br-floating br-floating: enabled: true type: ovs_bridge mtu: ${_param:interface_mtu} + proto: static + address: ${_param:external_address} + netmask: ${_param:opnfv_net_public_mask} + use_interfaces: + - ${_param:external_interface} + gateway: ${_param:opnfv_net_public_gw} + name_servers: {{ nm.dns_public }} br-mgmt: enabled: true type: bridge @@ -57,18 +64,3 @@ parameters: mtu: ${_param:interface_mtu} use_interfaces: - ${_param:primary_interface} - float-to-ex: - enabled: true - type: ovs_port - mtu: ${_param:interface_mtu} - bridge: br-floating - br-ex: - enabled: true - type: bridge - mtu: ${_param:interface_mtu} - address: ${_param:external_address} - netmask: ${_param:opnfv_net_public_mask} - use_interfaces: - - ${_param:external_interface} - use_ovs_ports: - - float-to-ex |