[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>

diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/infra/config_pdf.yml.j2 b/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/config_dpdk_pdf.yml.j2
similarity index 53%
rename from mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/infra/config_pdf.yml.j2
rename to mcp/reclass/classes/cluster/all-mcp-arch-common/infra/config_dpdk_pdf.yml.j2
index 08e8ab7..062e8a4 100644 (file)
--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/infra/config_pdf.yml.j2
+++ b/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/config_dpdk_pdf.yml.j2
@@ -1,43 +1,22 @@
 ##############################################################################
-# Copyright (c) 2017 Mirantis Inc., Enea AB and others.
+# Copyright (c) 2018 Mirantis Inc., Enea AB and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Apache License, Version 2.0
 # which accompanies this distribution, and is available at
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
-{# NOTE: br-{mgmt,ctl} are cross-referenced, careful when changing names #}
 {%- if conf.idf is defined and conf.idf.net_config is defined -%}
     {#- NOTE: Currently, we assume all cluster nodes use the same mapping -#}
 
     {#- Determine interface index for each network (plumbing vars) -#}
-    {%- set idx_admin = conf['idf']['net_config']['admin']['interface'] -%}
-    {%- set idx_mgmt = conf['idf']['net_config']['mgmt']['interface'] -%}
     {%- set idx_private = conf['idf']['net_config']['private']['interface'] -%}
-    {%- set idx_public = conf['idf']['net_config']['public']['interface'] -%}
 
     {#- Physical interface OS name for each network (e.g. em1, enp1s0f1) -#}
     {%- set node = conf['idf']['fuel']['network']['node'][0] -%}
-    {%- set nic_admin = node['interfaces'][idx_admin] -%}
-    {%- set nic_mgmt = node['interfaces'][idx_mgmt] -%}
     {%- set nic_private = node['interfaces'][idx_private] -%}
-    {%- set nic_public = node['interfaces'][idx_public] -%}
 
     {#- PCI addresses (only for DPDK on private) -#}
     {%- set bus_private = node['busaddr'][idx_private] -%}
-
-    {#- VLAN for each network (only untagged 'admin' is supported by MaaS config!) -#}
-    {%- set vlan_admin = conf['idf']['net_config']['admin']['vlan'] -%}
-    {%- set vlan_mgmt = conf['idf']['net_config']['mgmt']['vlan'] -%}
-    {%- set vlan_private = conf['idf']['net_config']['private']['vlan'] -%}
-    {%- set vlan_public = conf['idf']['net_config']['public']['vlan'] -%}
-{%- else -%}
-    {%- set nic_admin = 'enp6s0' -%}
-    {%- set nic_mgmt = 'enp6s0' -%}
-    {%- set nic_private = None -%}
-    {%- set nic_public = None -%}
-    {%- set vlan_admin = 'native' -%}
-    {%- set vlan_mgmt = '300' -%}
-    {%- set vlan_private = '1000' -%}
 {%- endif -%}
 ---
 parameters:

diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/infra/config.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/infra/config.yml
index 3b7ba99..5835110 100644 (file)
--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/infra/config.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/infra/config.yml
@@ -9,4 +9,4 @@
 classes:
   - cluster.baremetal-mcp-pike-common-ha.infra.config
   - cluster.baremetal-mcp-pike-ovs-dpdk-ha.infra
-  - cluster.baremetal-mcp-pike-ovs-dpdk-ha.infra.config_pdf
+  - cluster.all-mcp-arch-common.infra.config_dpdk_pdf

diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/openstack/compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/openstack/compute.yml
new file mode 100644 (file)
index 0000000..efb67e1
--- /dev/null
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/openstack/compute.yml
@@ -0,0 +1,24 @@
+##############################################################################
+# Copyright (c) 2018 Mirantis Inc., Enea AB and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+---
+classes:
+  - cluster.baremetal-mcp-pike-common-ha.openstack_compute
+  - cluster.baremetal-mcp-pike-ovs-dpdk-ha.infra
+  - cluster.baremetal-mcp-pike-ovs-dpdk-ha.openstack.compute_pdf
+  - system.neutron.compute.nfv.dpdk
+parameters:
+  neutron:
+    gateway:
+      dpdk: 'True'
+      vhost_socket_dir: ${_param:compute_ovs_vhost_socket_dir}
+      backend:
+        tenant_vlan_range: ${_param:neutron_tenant_vlan_range}
+  nova:
+    compute:
+      libvirt_service: libvirtd
+      libvirt_bin: /etc/default/libvirtd

diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/openstack/compute.yml.j2 b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/openstack/compute_pdf.yml.j2
similarity index 70%
rename from mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/openstack/compute.yml.j2
rename to mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/openstack/compute_pdf.yml.j2
index 76fa179..faa4558 100644 (file)
--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/openstack/compute.yml.j2
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/openstack/compute_pdf.yml.j2
@@ -1,5 +1,5 @@
 ##############################################################################
-# Copyright (c) 2017 Mirantis Inc., Enea AB and others.
+# Copyright (c) 2018 Mirantis Inc., Enea AB and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Apache License, Version 2.0
 # which accompanies this distribution, and is available at
@@ -11,21 +11,7 @@
     {%- set vlan_private = '1000' -%}
 {%- endif -%}
 ---
-classes:
-  - cluster.baremetal-mcp-pike-common-ha.openstack_compute
-  - cluster.baremetal-mcp-pike-ovs-dpdk-ha.infra
-  - system.neutron.compute.nfv.dpdk
 parameters:
-  neutron:
-    gateway:
-      dpdk: 'True'
-      vhost_socket_dir: ${_param:compute_ovs_vhost_socket_dir}
-      backend:
-        tenant_vlan_range: ${_param:neutron_tenant_vlan_range}
-  nova:
-    compute:
-      libvirt_service: libvirtd
-      libvirt_bin: /etc/default/libvirtd
   linux:
     network:
       interface:

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 994f1c6..cb0ae7d 100644 (file)
--- 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
@@ -24,7 +24,7 @@ parameters:
     reclass_config_master: ${_param:opnfv_infra_config_pxe_address}
     salt_master_environment_repository: "https://github.com/tcpcloud"
     salt_master_environment_revision: master
-    single_address: 172.16.10.100
+    single_address: ${_param:opnfv_infra_config_address}
     salt_master_host: 127.0.0.1
     salt_master_base_environment: prd
     salt_minion_ca_host: ${linux:network:fqdn}
@@ -71,11 +71,11 @@ parameters:
             single_address: ${_param:openstack_control_node01_address}
         openstack_compute_node01:
           params:
-            single_address: 172.16.10.101
-            tenant_address: 10.1.0.101
-            external_address: 10.16.0.101
+            single_address: ${_param:opnfv_openstack_compute_node01_control_address}
+            tenant_address: ${_param:opnfv_openstack_compute_node01_tenant_address}
+            external_address: ${_param:opnfv_openstack_compute_node01_external_address}
         openstack_compute_node02:
           params:
-            single_address: 172.16.10.102
-            tenant_address: 10.1.0.102
-            external_address: 10.16.0.102
+            single_address: ${_param:opnfv_openstack_compute_node02_control_address}
+            tenant_address: ${_param:opnfv_openstack_compute_node02_tenant_address}
+            external_address: ${_param:opnfv_openstack_compute_node02_external_address}

diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/init_options.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/init_options.yml
index 2affd3d..58561d8 100644 (file)
--- a/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/init_options.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/init_options.yml
@@ -6,21 +6,23 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 ---
+classes:
+  - cluster.all-mcp-arch-common
 parameters:
   _param:
     # infra service addresses
-    infra_config_address: 172.16.10.100
+    infra_config_address: ${_param:opnfv_infra_config_address}
     # openstack service addresses
-    openstack_control_address: 172.16.10.11
-    openstack_control_node01_address: 172.16.10.11
-    openstack_control_node02_address: 172.16.10.12
-    openstack_control_node03_address: 172.16.10.13
+    openstack_control_address: ${_param:opnfv_openstack_control_node01_address}
+    openstack_control_node01_address: ${_param:opnfv_openstack_control_node01_address}
+    openstack_control_node02_address: ${_param:opnfv_openstack_control_node02_address}
+    openstack_control_node03_address: ${_param:opnfv_openstack_control_node03_address}
     openstack_database_address: ${_param:openstack_control_address}
     openstack_message_queue_address: ${_param:openstack_control_address}
     openstack_message_queue_node01_address: ${_param:openstack_control_node01_address}
     openstack_message_queue_node02_address: ${_param:openstack_control_node02_address}
     openstack_message_queue_node03_address: ${_param:openstack_control_node03_address}
-    openstack_gateway_address: 172.16.10.124
+    openstack_gateway_address: ${_param:opnfv_openstack_gateway_node01_address}
     control_address: ${_param:openstack_control_address}
     ntp_strata_host1: 1.se.pool.ntp.org
     ntp_strata_host2: 0.se.pool.ntp.org

diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_init.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_init.yml
index 5d2efb5..f62e204 100644 (file)
--- a/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_init.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_init.yml
@@ -14,7 +14,7 @@ parameters:
     openstack_region: RegionOne
     admin_email: root@localhost
     cluster_public_protocol: http
-    cluster_public_host: 10.16.0.11
+    cluster_public_host: ${_param:opnfv_openstack_control_node01_external_address}
     neutron_public_protocol: http
     neutron_control_dvr: 'False'
     neutron_l3_ha: 'False'
@@ -31,11 +31,11 @@ parameters:
     cluster_vip_address: ${_param:cluster_public_host}
     cluster_local_address: ${_param:openstack_control_address}
     cluster_node01_hostname: ctl01
-    cluster_node01_address: 172.16.10.11
+    cluster_node01_address: ${_param:opnfv_openstack_control_node01_address}
     cluster_node02_hostname: ctl02
-    cluster_node02_address: 172.16.10.12
+    cluster_node02_address: ${_param:opnfv_openstack_control_node02_address}
     cluster_node03_hostname: ctl03
-    cluster_node03_address: 172.16.10.13
+    cluster_node03_address: ${_param:opnfv_openstack_control_node03_address}
     rabbitmq_secret_key: opnfv_secret
     rabbitmq_admin_password: opnfv_secret
     rabbitmq_openstack_password: opnfv_secret
@@ -52,8 +52,6 @@ parameters:
     ceilometer_database_host: ${_param:cluster_local_address}
     cinder_version: ${_param:openstack_version}
     cinder_service_host: ${_param:cluster_local_address}
-    ceilometer_graphite_publisher_host: 172.16.10.107
-    ceilometer_graphite_publisher_port: 2013
     nova_version: ${_param:openstack_version}
     nova_service_host: ${_param:cluster_local_address}
     nova_vncproxy_url: http://${_param:cluster_vip_address}:8060
@@ -124,12 +122,12 @@ parameters:
             - gtw01
             - gtw01.${_param:cluster_domain}
         cmp01:
-          address: 172.16.10.101
+          address: ${_param:opnfv_openstack_compute_node01_control_address}
           names:
             - cmp01
             - cmp01.${_param:cluster_domain}
         cmp02:
-          address: 172.16.10.102
+          address: ${_param:opnfv_openstack_compute_node02_control_address}
           names:
             - cmp02
             - cmp02.${_param:cluster_domain}

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 89acc4a..037b357 100644 (file)
--- 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
@@ -23,5 +23,5 @@ parameters:
             single_address: ${_param:opendaylight_service_host}
         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-odl-noha/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/init.yml
index 7575d89..e5bacff 100644 (file)
--- a/mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/init.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/init.yml
@@ -8,11 +8,10 @@
 ---
 classes:
   - system.linux.system.single
-  - cluster.all-mcp-arch-common
   - cluster.virtual-mcp-pike-common-noha.init_options
   - cluster.virtual-mcp-pike-odl-noha.infra
   - cluster.virtual-mcp-pike-odl-noha.openstack
 
 parameters:
   _param:
-    opendaylight_service_host: 172.16.10.111
+    opendaylight_service_host: ${_param:opnfv_opendaylight_server_node01_single_address}

diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/openstack/compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/openstack/compute.yml
index 4987080..6aef9b4 100644 (file)
--- a/mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/openstack/compute.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/openstack/compute.yml
@@ -33,7 +33,7 @@ parameters:
           proto: static
           address: ${_param:tenant_address}
           netmask: 255.255.255.0
-          gateway: 10.1.0.124
+          gateway: ${_param:opnfv_openstack_gateway_node01_tenant_address}
           use_interfaces:
             - ${_param:tenant_interface}
         br-floating:

diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/openstack/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/openstack/init.yml
index cbf4e69..4607190 100644 (file)
--- a/mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/openstack/init.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/openstack/init.yml
@@ -16,7 +16,7 @@ parameters:
     network:
       host:
         odl01:
-          address: 172.16.10.111
+          address: ${_param:opnfv_opendaylight_server_node01_single_address}
           names:
             - odl01
             - odl01.${_param:cluster_domain}

diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovn-noha/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovn-noha/init.yml
index 0fd6fa7..6ab0986 100644 (file)
--- a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovn-noha/init.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovn-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-ovn-noha.infra
   - cluster.virtual-mcp-pike-ovn-noha.openstack

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 25ee712..fc052e5 100644 (file)
--- 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 07e3ef2..1b1dcd0 100644 (file)
--- 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

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 cefa172..7a0cce3 100644 (file)
--- 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
@@ -16,5 +16,5 @@ parameters:
       node:
         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-noha/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/init.yml
index b29ac95..ac8a45f 100644 (file)
--- a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/init.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-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-noha.infra
   - cluster.virtual-mcp-pike-ovs-noha.openstack