X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=mcp%2Freclass%2Fclasses%2Fcluster%2Fbaremetal-mcp-ocata-odl-ha%2Finfra%2Finit.yml;h=a8491166130726877c56ce694804720d8014d12a;hb=186e1ca5b3ee1b0b76e5d6ddecfee0a94bae45fd;hp=5862ddb1deb2eeb3f91c910e8dc88fa9afce5218;hpb=0f3fc04189db6156dd3a6d85c834f94b1d0c69aa;p=fuel.git

diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml
index 5862ddb1d..a84911661 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml
@@ -1,88 +1,103 @@
+---
 classes:
-- system.linux.system.single
-- cluster.baremetal-mcp-ocata-odl-ha.openstack
-# - cluster.baremetal-mcp-ocata-odl-ha.stacklight
-# - cluster.baremetal-mcp-ocata-odl-ha.stacklight.client
+  - system.linux.system.single
+  - cluster.all-mcp-ocata-common
+  - cluster.baremetal-mcp-ocata-odl-ha.openstack
+  # - cluster.baremetal-mcp-ocata-odl-ha.stacklight
+  # - cluster.baremetal-mcp-ocata-odl-ha.stacklight.client
 parameters:
   _param:
     apt_mk_version: nightly
     mcp_repo_version: 1.1
+    salt_version: 2016.11
     cluster_name: baremetal-mcp-ocata-odl-ha
     cluster_domain: ${_param:cluster_name}.local
-#    stacklight_environment: ${_param:cluster_domain}
+    # stacklight_environment: ${_param:cluster_domain}
     reclass_data_revision: master
     cluster_public_host: ${_param:openstack_proxy_address}
     infra_config_hostname: cfg01
     infra_maas_database_password: opnfv_secret
 
     # infra service addresses
-    infra_config_address: 10.167.4.100
-    infra_config_deploy_address: 192.168.10.100
-    infra_maas_node01_address: 10.167.4.3
-    infra_maas_node01_deploy_address: 192.168.11.3
-    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_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
     infra_kvm_node02_hostname: kvm02
     infra_kvm_node03_hostname: kvm03
 
+    ntp_strata_host1: 1.pool.ntp.org
+    ntp_strata_host2: 0.pool.ntp.org
+
     # Interface definitions
     reclass:
       storage:
         node:
           name: default
+    dhcp_nic: ${_param:infra_primary_nic}
+    single_nic: ${_param:infra_secondary_nic}
     linux_dhcp_interface:
       enabled: true
       type: eth
       proto: dhcp
+      name: ${_param:dhcp_nic}
     linux_single_interface:
       enabled: true
       type: eth
       proto: static
+      name: ${_param:single_nic}
       address: ${_param:single_address}
       netmask: 255.255.255.0
 
-    salt_control_xenial_image: http://apt.mirantis.com/images/ubuntu-16-04-x64-latest.qcow2
+    # yamllint disable-line rule:line-length
     salt_api_password_hash: "$6$WV0P1shnoDh2gI/Z$22/Bcd7ffMv0jDlFpT63cAU4PiXHz9pjXwngToKwqAsgoeK4HNR3PiKaushjxp3JsQ8hNoJmAC6TxzVqfV8WH/"
   linux:
+    system:
+      user:
+        ubuntu:
+          enabled: true
+          sudo: true
+          home: /home/ubuntu
     network:
       host:
         cfg01:
           address: ${_param:infra_config_address}
           names:
-          - cfg01
-          - cfg01.${_param:cluster_domain}
+            - cfg01
+            - cfg01.${_param:cluster_domain}
         cfg:
           address: ${_param:infra_config_address}
           names:
-          - ${_param:infra_config_hostname}
-          - ${_param:infra_config_hostname}.${_param:cluster_domain}
+            - ${_param:infra_config_hostname}
+            - ${_param:infra_config_hostname}.${_param:cluster_domain}
         mas01:
           address: ${_param:infra_maas_node01_address}
           names:
-          - ${_param:infra_maas_node01_hostname}
-          - ${_param:infra_maas_node01_hostname}.${_param:cluster_domain}
+            - ${_param:infra_maas_node01_hostname}
+            - ${_param:infra_maas_node01_hostname}.${_param:cluster_domain}
         kvm01:
           address: ${_param:infra_kvm_node01_address}
           names:
-          - ${_param:infra_kvm_node01_hostname}
-          - ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
+            - ${_param:infra_kvm_node01_hostname}
+            - ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
         kvm02:
           address: ${_param:infra_kvm_node02_address}
           names:
-          - ${_param:infra_kvm_node02_hostname}
-          - ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
+            - ${_param:infra_kvm_node02_hostname}
+            - ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
         kvm03:
           address: ${_param:infra_kvm_node03_address}
           names:
-          - ${_param:infra_kvm_node03_hostname}
-          - ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
+            - ${_param:infra_kvm_node03_hostname}
+            - ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}