aboutsummaryrefslogtreecommitdiffstats
path: root/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-01-27 07:13:08 +0100
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-02-05 06:03:35 +0100
commit342b6bad34e8c949aa81adf711e6a357e56942d3 (patch)
treebe03c0877ef6d95eda018736a24d36c228c05c47 /mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha
parent7f2ca07e6822f99ef37c3f9ca6cce15ff00ffed8 (diff)
[virtual] Parameterize cluster model based on PDF
- 10.1.0.0/24 (internal): * 10.1.0.101 -> opnfv_openstack_compute_node01_tenant_address * 10.1.0.124 -> opnfv_openstack_gateway_node01_tenant_address - 172.16.10.0/24 (mgmt): * 172.16.10.11 -> opnfv_openstack_control_node01_address * 172.16.10.100 -> opnfv_infra_config_address * 172.16.10.101 -> opnfv_openstack_compute_node01_control_address * 172.16.10.111 -> opnfv_opendaylight_server_node01_single_address * 172.16.10.124 -> opnfv_openstack_gateway_node01_address - 10.16.0.0/24 (public): * 10.16.0.11 -> opnfv_openstack_control_node01_external_address * 10.16.0.101 -> opnfv_openstack_compute_node01_external_address * 10.16.0.124 -> opnfv_openstack_gateway_node01_external_address To re-use DPDK config baremetal template, move: - cluster.baremetal-mcp-pike-ovs-dpdk-ha.infra.config_pdf + cluster.all-mcp-arch-common.infra.config_dpdk_pdf Drop unused 'ceilometer_graphite_publisher_host' (172.16.10.107). JIRA: FUEL-322 Change-Id: I3aef3415bd696a7ae5b566af12af4733a50c2135 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha')
-rw-r--r--mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/infra/config.yml13
-rw-r--r--mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/init.yml1
2 files changed, 3 insertions, 11 deletions
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 25ee71226..fc052e540 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
@@ -10,19 +10,12 @@ classes:
- system.reclass.storage.system.openstack_gateway_single
- cluster.virtual-mcp-pike-common-noha.infra.config
- cluster.virtual-mcp-pike-ovs-dpdk-noha
+ - cluster.all-mcp-arch-common.infra.config_dpdk_pdf
parameters:
reclass:
storage:
node:
- openstack_compute_node01:
- params:
- dpdk0_name: ${_param:opnfv_fn_vm_tertiary_interface}
- dpdk0_pci: '"0000:00:05.0"'
- openstack_compute_node02:
- params:
- dpdk0_name: ${_param:opnfv_fn_vm_tertiary_interface}
- dpdk0_pci: '"0000:00:05.0"'
openstack_gateway_node01:
params:
- tenant_address: 10.1.0.124
- external_address: 10.16.0.124
+ tenant_address: ${_param:opnfv_openstack_gateway_node01_tenant_address}
+ external_address: ${_param:opnfv_openstack_gateway_node01_external_address}
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/init.yml
index 07e3ef2ca..1b1dcd048 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/init.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/init.yml
@@ -8,7 +8,6 @@
---
classes:
- system.linux.system.single
- - cluster.all-mcp-arch-common
- cluster.virtual-mcp-pike-common-noha.init_options
- cluster.virtual-mcp-pike-ovs-dpdk-noha.infra
- cluster.virtual-mcp-pike-ovs-dpdk-noha.openstack