Merge "Pod Descriptor File compatible reclass structure" into stable/euphrates

4 files changed, 53 insertions, 55 deletions

diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/config.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/config.yml
index a75b41d3d..452062191 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/config.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/config.yml
@@ -24,7 +24,6 @@ parameters:
     reclass_data_repository: local
     salt_master_environment_repository: "https://github.com/tcpcloud"
     salt_master_environment_revision: master
-    reclass_config_master: ${_param:infra_config_deploy_address}
     single_address: ${_param:infra_config_address}
     deploy_address: ${_param:infra_config_deploy_address}
     salt_master_host: ${_param:infra_config_deploy_address}
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml
index 6bf0fbe63..64473fcb1 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml
@@ -17,19 +17,19 @@ parameters:
     infra_maas_database_password: opnfv_secret
 
     # infra service addresses
-    infra_config_address: 10.167.4.100
-    infra_config_deploy_address: 10.20.0.2
-    infra_maas_node01_address: 10.167.4.3
-    infra_maas_node01_deploy_address: ${_param:opnfv_fuel_maas_pxe_address}
-    infra_maas_node01_external_address: 10.16.0.3
-    infra_compute_node01_address: 10.167.4.141
-    infra_compute_node02_address: 10.167.4.142
-    infra_compute_node03_address: 10.167.4.143
+    infra_config_address: ${_param:opnfv_infra_config_address}
+    infra_config_deploy_address: ${_param:reclass_config_master}
+    infra_maas_node01_address: ${_param:opnfv_infra_maas_node01_address}
+    infra_maas_node01_deploy_address: ${_param:opnfv_maas_pxe_address}
+    infra_maas_node01_external_address: ${_param:opnfv_infra_maas_node01_external_address}
+    infra_compute_node01_address: ${_param:opnfv_infra_compute_node01_address}
+    infra_compute_node02_address: ${_param:opnfv_infra_compute_node02_address}
+    infra_compute_node03_address: ${_param:opnfv_infra_compute_node03_address}
 
-    infra_kvm_address: 10.167.4.140
-    infra_kvm_node01_address: 10.167.4.141
-    infra_kvm_node02_address: 10.167.4.142
-    infra_kvm_node03_address: 10.167.4.143
+    infra_kvm_address: ${_param:opnfv_infra_kvm_address}
+    infra_kvm_node01_address: ${_param:opnfv_infra_kvm_node01_address}
+    infra_kvm_node02_address: ${_param:opnfv_infra_kvm_node02_address}
+    infra_kvm_node03_address: ${_param:opnfv_infra_kvm_node03_address}
 
     infra_maas_node01_hostname: mas01
     infra_kvm_node01_hostname: kvm01
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/kvm.yml
index e413a4906..a8deb5de0 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/kvm.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/kvm.yml
@@ -143,17 +143,16 @@ parameters:
           enabled: true
           proto: dhcp
           type: bridge
-          name_servers:
-          - 8.8.8.8
-          - 8.8.4.4
+          name_servers: ${_param:opnfv_name_servers}
           use_interfaces:
           - ${_param:deploy_nic}
           noifupdown: true
-        vlan300:
+        mgmt-vlan:
+          name: vlan${_param:opnfv_net_mgmt_vlan}
           enabled: true
           proto: manual
           type: vlan
-          name: ${_param:deploy_nic}.300
+          name: ${_param:deploy_nic}.${_param:opnfv_net_mgmt_vlan}
           use_interfaces:
           - ${_param:deploy_nic}
         br-ctl:
@@ -163,4 +162,4 @@ parameters:
           address: ${_param:single_address}
           netmask: 255.255.255.0
           use_interfaces:
-          - ${_param:deploy_nic}.300
+          - ${_param:deploy_nic}.${_param:opnfv_net_mgmt_vlan}
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml
index f77abea6d..b9d84eaff 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml
@@ -15,7 +15,7 @@ parameters:
     maas_admin_username: opnfv
     maas_admin_password: opnfv_secret
     maas_db_password: opnfv_secret
-    dns_server01: 8.8.4.4
+    dns_server01: ${_param:opnfv_dns_server01}
     single_address: ${_param:infra_maas_node01_deploy_address}
   maas:
     region:
@@ -32,13 +32,13 @@ parameters:
         network_discovery: 'enabled'
         default_min_hwe_kernel: 'hwe-16.04'
       subnets:
-        opnfv_fuel_maas_pxe:
-          name: ${_param:opnfv_fuel_maas_pxe_network}/24
-          cidr: ${_param:opnfv_fuel_maas_pxe_network}/24
+        opnfv_maas_pxe:
+          name: ${_param:opnfv_maas_pxe_network}/24
+          cidr: ${_param:opnfv_maas_pxe_network}/24
           gateway_ip: ${_param:single_address}
           iprange:
-            start: ${_param:opnfv_fuel_maas_pxe_iprange_start}
-            end: ${_param:opnfv_fuel_maas_pxe_iprange_end}
+            start: ${_param:opnfv_maas_pxe_iprange_start}
+            end: ${_param:opnfv_maas_pxe_iprange_end}
             type: dynamic
           vlans:
             untagged:
@@ -48,57 +48,57 @@ parameters:
       machines:
         kvm01:
           interface:
-            mac: "00:25:b5:a0:00:2a"
+            mac: ${_param:opnfv_maas_node01_interface_mac}
           power_parameters:
-            power_address: "172.30.8.75"
-            power_password: "octopus"
-            power_type: ipmi
-            power_user: "admin"
-          architecture: 'amd64/generic'
+            power_address: ${_param:opnfv_maas_node01_power_address}
+            power_password: ${_param:opnfv_maas_node01_power_password}
+            power_type: ${_param:opnfv_maas_node01_power_type}
+            power_user: ${_param:opnfv_maas_node01_power_user}
+          architecture: ${_param:opnfv_maas_node01_architecture}
           distro_series: xenial
           hwe_kernel: hwe-16.04
         kvm02:
           interface:
-            mac: "00:25:b5:a0:00:3a"
+            mac: ${_param:opnfv_maas_node02_interface_mac}
           power_parameters:
-            power_address: "172.30.8.65"
-            power_password: "octopus"
-            power_type: ipmi
-            power_user: "admin"
-          architecture: 'amd64/generic'
+            power_address: ${_param:opnfv_maas_node02_power_address}
+            power_password: ${_param:opnfv_maas_node02_power_password}
+            power_type: ${_param:opnfv_maas_node02_power_type}
+            power_user: ${_param:opnfv_maas_node02_power_user}
+          architecture: ${_param:opnfv_maas_node02_architecture}
           distro_series: xenial
           hwe_kernel: hwe-16.04
         kvm03:
           interface:
-            mac: "00:25:b5:a0:00:4a"
+            mac: ${_param:opnfv_maas_node03_interface_mac}
           power_parameters:
-            power_address: "172.30.8.74"
-            power_password: "octopus"
-            power_type: ipmi
-            power_user: "admin"
-          architecture: 'amd64/generic'
+            power_address: ${_param:opnfv_maas_node03_power_address}
+            power_password: ${_param:opnfv_maas_node03_power_password}
+            power_type: ${_param:opnfv_maas_node03_power_type}
+            power_user: ${_param:opnfv_maas_node03_power_user}
+          architecture: ${_param:opnfv_maas_node03_architecture}
           distro_series: xenial
           hwe_kernel: hwe-16.04
         cmp001:
           interface:
-            mac: "00:25:b5:a0:00:5a"
+            mac: ${_param:opnfv_maas_node04_interface_mac}
           power_parameters:
-            power_address: "172.30.8.73"
-            power_password: "octopus"
-            power_type: ipmi
-            power_user: "admin"
-          architecture: 'amd64/generic'
+            power_address: ${_param:opnfv_maas_node04_power_address}
+            power_password: ${_param:opnfv_maas_node04_power_password}
+            power_type: ${_param:opnfv_maas_node04_power_type}
+            power_user: ${_param:opnfv_maas_node04_power_user}
+          architecture: ${_param:opnfv_maas_node04_architecture}
           distro_series: xenial
           hwe_kernel: hwe-16.04
         cmp002:
           interface:
-            mac: "00:25:b5:a0:00:6a"
+            mac: ${_param:opnfv_maas_node05_interface_mac}
           power_parameters:
-            power_address: "172.30.8.72"
-            power_password: "octopus"
-            power_type: ipmi
-            power_user: "admin"
-          architecture: 'amd64/generic'
+            power_address: ${_param:opnfv_maas_node05_power_address}
+            power_password: ${_param:opnfv_maas_node05_power_password}
+            power_type: ${_param:opnfv_maas_node05_power_type}
+            power_user: ${_param:opnfv_maas_node05_power_user}
+          architecture: ${_param:opnfv_maas_node05_architecture}
           distro_series: xenial
           hwe_kernel: hwe-16.04
   linux: