Configure neutron gateway

Change-Id: I01744bd5728d6fc4c8cd3792aee9759434d18645
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>

5 files changed, 35 insertions, 58 deletions

diff --git a/mcp/config/scenario/baremetal/os-nosdn-nofeature-ha.yaml b/mcp/config/scenario/baremetal/os-nosdn-nofeature-ha.yaml
index 3f78bea8a..780edbd81 100644
--- a/mcp/config/scenario/baremetal/os-nosdn-nofeature-ha.yaml
+++ b/mcp/config/scenario/baremetal/os-nosdn-nofeature-ha.yaml
@@ -3,7 +3,6 @@ cluster:
   states:
     - maas
     - openstack_ha
-    - neutron_compute
     - networks
 virtual:
   nodes:
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/config.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/config.yml
index 77443deec..ce2c95145 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/config.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/config.yml
@@ -10,7 +10,6 @@ classes:
 - system.reclass.storage.system.physical_control_cluster
 - system.reclass.storage.system.openstack_control_cluster
 - system.reclass.storage.system.openstack_proxy_cluster
-- system.reclass.storage.system.openstack_gateway_cluster
 - system.reclass.storage.system.openstack_database_cluster
 - system.reclass.storage.system.openstack_message_queue_cluster
 - system.reclass.storage.system.openstack_telemetry_cluster
@@ -119,6 +118,7 @@ parameters:
             control_address: ${_param:openstack_compute_node01_control_address}
             single_address: ${_param:openstack_compute_node01_single_address}
             tenant_address: ${_param:openstack_compute_node01_tenant_address}
+            external_address: ${_param:openstack_compute_node01_external_address}
         openstack_compute_node02:
           name: ${_param:openstack_compute_node02_hostname}
           domain: ${_param:cluster_domain}
@@ -130,3 +130,4 @@ parameters:
             control_address: ${_param:openstack_compute_node02_control_address}
             single_address: ${_param:openstack_compute_node02_single_address}
             tenant_address: ${_param:openstack_compute_node02_tenant_address}
+            external_address: ${_param:openstack_compute_node02_external_address}
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml
index 18a7a0bb2..070ab7865 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml
@@ -5,7 +5,7 @@ classes:
 - system.nova.compute.cluster
 - system.nova.compute.nfv.hugepages
 - system.nova.compute.nfv.cpu_pinning
-- system.neutron.compute.cluster
+- system.neutron.gateway.cluster
 - system.ceilometer.agent.cluster
 - cluster.baremetal-mcp-ocata-ovs-ha.infra
 parameters:
@@ -21,7 +21,11 @@ parameters:
     nova_vncproxy_url: https://${_param:cluster_public_host}:6080
     mgmt_nic: enp6s0
     tenant_nic: enp7s0
+    external_nic: enp8s0
     linux_system_codename: xenial
+    interface_mtu: 1500
+    keepalived_vip_interface: br-ctl
+    keepalived_vip_virtual_router_id: 69
   linux:
     network:
       bridge: openvswitch
@@ -36,6 +40,12 @@ parameters:
           type: eth
           proto: manual
           name: ${_param:tenant_nic}
+        external_nic:
+          enabled: true
+          name: ${_param:external_nic}
+          mtu: ${_param:interface_mtu}
+          proto: manual
+          type: eth
         br-mesh:
           enabled: true
           type: bridge
@@ -66,3 +76,22 @@ parameters:
           netmask: 255.255.255.0
           use_interfaces:
           - ${_param:mgmt_nic}.300
+        br-floating:
+          enabled: true
+          type: ovs_bridge
+          mtu: ${_param:interface_mtu}
+        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: 255.255.255.0
+          use_interfaces:
+          - ${_param:external_nic}
+          use_ovs_ports:
+          - float-to-ex
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/gateway.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/gateway.yml
deleted file mode 100644
index b9dcf724b..000000000
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/gateway.yml
+++ /dev/null
@@ -1,54 +0,0 @@
-classes:
-- system.linux.system.repo.mcp.openstack
-- system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
-- system.neutron.gateway.cluster
-- cluster.baremetal-mcp-ocata-ovs-ha.infra
-parameters:
-  _param:
-    interface_mtu: 1500
-    cluster_vip_address: ${_param:openstack_control_address}
-
-    linux_system_codename: xenial
-    keepalived_vip_interface: br-ctl
-    keepalived_vip_virtual_router_id: 69
-    primary_first_nic: eno2
-  linux:
-    network:
-      bridge: openvswitch
-      interface:
-        primary_first_nic:
-          enabled: true
-          type: slave
-          proto: manual
-          name: ${_param:primary_first_nic}
-          master: bond0
-        bond0:
-          enabled: true
-          proto: manual
-          ovs_bridge: br-floating
-          ovs_type: OVSPort
-          type: bond
-          use_interfaces:
-          - ${_param:primary_first_nic}
-          slaves: ${_param:primary_first_nic}
-          mode: active-backup
-        br-floating:
-          enabled: true
-          type: ovs_bridge
-        br-ctl:
-          enabled: true
-          type: ovs_port
-          bridge: br-floating
-          proto: static
-          ovs_options: tag=2408
-          address: ${_param:single_address}
-          netmask: 255.255.255.0
-        br-mesh:
-          enabled: true
-          type: ovs_port
-          bridge: br-floating
-          proto: static
-          ovs_options: tag=2409
-          address: ${_param:tenant_address}
-          netmask: 255.255.255.0
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/init.yml
index 4036be13d..9c2bc7b40 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/init.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/init.yml
@@ -51,6 +51,8 @@ parameters:
     openstack_compute_node01_tenant_address: 10.1.0.101
     openstack_compute_node02_tenant_address: 10.1.0.102
     openstack_compute_node03_tenant_address: 10.1.0.103
+    openstack_compute_node01_external_address: 172.30.10.2
+    openstack_compute_node02_external_address: 172.30.10.3
 
     # openstack service hostnames
     openstack_proxy_hostname: prx
@@ -85,7 +87,7 @@ parameters:
     neutron_gateway_agent_mode: legacy
     neutron_compute_dvr: False
     neutron_compute_agent_mode: legacy
-    neutron_compute_external_access: False
+    neutron_compute_external_access: True
     galera_server_cluster_name: openstack_cluster
     galera_server_maintenance_password: opnfv_secret
     galera_server_admin_password: opnfv_secret