[ovn] Weed out gateway node from reclass storage

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

5 files changed, 19 insertions, 5 deletions

diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/infra/config.yml
index ada2c2545..7e3a49491 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/infra/config.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/infra/config.yml
@@ -17,7 +17,6 @@ classes:
   - system.salt.minion.cert.proxy
   - system.mysql.client.single
   - system.reclass.storage.system.openstack_compute_multi
-  - system.reclass.storage.system.openstack_gateway_single
 parameters:
   _param:
     openstack_control_node01_hostname: ctl01
@@ -68,7 +67,3 @@ parameters:
             single_address: 172.16.10.106
             tenant_address: 10.1.0.106
             external_address: 10.16.0.106
-        openstack_gateway_node01:
-          params:
-            tenant_address: 10.1.0.110
-            external_address: 10.16.0.110
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/infra/config.yml
index 19dc9feb9..8e38ff81d 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/infra/config.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/infra/config.yml
@@ -8,6 +8,7 @@
 ---
 classes:
   - system.reclass.storage.system.opendaylight_control_single
+  - system.reclass.storage.system.openstack_gateway_single
   - cluster.virtual-mcp-pike-common-noha.infra.config
   - cluster.virtual-mcp-pike-odl-noha
 parameters:
@@ -20,3 +21,7 @@ parameters:
           params:
             linux_system_codename: xenial
             single_address: ${_param:opendaylight_service_host}
+        openstack_gateway_node01:
+          params:
+            tenant_address: 10.1.0.110
+            external_address: 10.16.0.110
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/infra/config.yml
index 70dcd2f8a..e80c442ef 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/infra/config.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/infra/config.yml
@@ -7,6 +7,7 @@
 ##############################################################################
 ---
 classes:
+  - system.reclass.storage.system.openstack_gateway_single
   - cluster.virtual-mcp-pike-common-noha.infra.config
   - cluster.virtual-mcp-pike-ovs-dpdk-noha
 parameters:
@@ -21,3 +22,7 @@ parameters:
           params:
             dpdk0_name: ${_param:opnfv_fn_vm_tertiary_interface}
             dpdk0_pci: '"0000:00:05.0"'
+        openstack_gateway_node01:
+          params:
+            tenant_address: 10.1.0.110
+            external_address: 10.16.0.110
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/infra/config.yml
index dcf87774c..66c246859 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/infra/config.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/infra/config.yml
@@ -7,5 +7,14 @@
 ##############################################################################
 ---
 classes:
+  - system.reclass.storage.system.openstack_gateway_single
   - cluster.virtual-mcp-pike-common-noha.infra.config
   - cluster.virtual-mcp-pike-ovs-noha
+parameters:
+  reclass:
+    storage:
+      node:
+        openstack_gateway_node01:
+          params:
+            tenant_address: 10.1.0.110
+            external_address: 10.16.0.110
diff --git a/mcp/reclass/classes/system b/mcp/reclass/classes/system
-Subproject 426fec4fa187be968eaf57374c956a361aa6541
+Subproject 86378e7534a28143478cbf010928b30bfef81af