From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Date: Sat, 16 Dec 2017 18:18:45 +0000 (+0100)
Subject: [baremetal] cleanup: Remove unused gtw node data
X-Git-Tag: opnfv-6.0.0~195^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=4530abae7824456eade2456af7bcc6fe29e8c0bc;p=fuel.git

[baremetal] cleanup: Remove unused gtw node data

Change-Id: I48f73caa0f7cae532d4d9b3f68e1d8de59f8dd9e
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
---

diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_init.yml
index fe4be9d60..0d4c66682 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_init.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_init.yml
@@ -11,16 +11,6 @@ parameters:
 
     openstack_version: pike
 
-    openstack_gateway_node01_address: ${_param:opnfv_openstack_gateway_node01_address}
-    openstack_gateway_node02_address: ${_param:opnfv_openstack_gateway_node02_address}
-    openstack_gateway_node03_address: ${_param:opnfv_openstack_gateway_node03_address}
-    openstack_gateway_node01_tenant_address: ${_param:opnfv_openstack_gateway_node01_tenant_address}
-    openstack_gateway_node02_tenant_address: ${_param:opnfv_openstack_gateway_node02_tenant_address}
-    openstack_gateway_node03_tenant_address: ${_param:opnfv_openstack_gateway_node03_tenant_address}
-    openstack_gateway_node01_hostname: gtw01
-    openstack_gateway_node02_hostname: gtw02
-    openstack_gateway_node03_hostname: gtw03
-
     # openstack service addresses
     openstack_proxy_node01_control_address: ${_param:opnfv_openstack_proxy_node01_control_address}
     openstack_proxy_node02_control_address: ${_param:opnfv_openstack_proxy_node02_control_address}
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/openstack/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/openstack/init.yml
index 84ab1aa83..f1c8b93a4 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/openstack/init.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/openstack/init.yml
@@ -16,16 +16,3 @@ parameters:
     compute_hugepages_count: 16
     compute_hugepages_mount: /mnt/hugepages_1G
     compute_kernel_isolcpu: ${_param:nova_cpu_pinning}
-  linux:
-    network:
-      host:
-        gtw01:
-          address: ${_param:openstack_gateway_node01_address}
-          names:
-            - ${_param:openstack_gateway_node01_hostname}
-            - ${_param:openstack_gateway_node01_hostname}.${_param:cluster_domain}
-        gtw02:
-          address: ${_param:openstack_gateway_node02_address}
-          names:
-            - ${_param:openstack_gateway_node02_hostname}
-            - ${_param:openstack_gateway_node02_hostname}.${_param:cluster_domain}