summaryrefslogtreecommitdiffstats
path: root/mcp/reclass
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-12-18 15:37:31 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-12-18 15:37:31 +0000
commit8673180dad54592382f339dba35cd3d753c5d18e (patch)
treebdccbce3d9f9a090909ad30cd8c21373c5ed162a /mcp/reclass
parenta4abff17c7b71408762353bb1ef52d9ffbec2fb7 (diff)
parent4530abae7824456eade2456af7bcc6fe29e8c0bc (diff)
Merge "[baremetal] cleanup: Remove unused gtw node data"
Diffstat (limited to 'mcp/reclass')
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_init.yml10
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/openstack/init.yml13
2 files changed, 0 insertions, 23 deletions
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}