reclass: baremetal: Factor out common code

[fuel.git] / mcp / reclass / classes / cluster / baremetal-mcp-ocata-ovs-ha / infra / init.yml

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 7c250a3..29615fb 100644 (file)
--- 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
@@ -1,103 +1,7 @@
 ---
 classes:
-  - system.linux.system.single
-  - cluster.all-mcp-ocata-common
   - cluster.baremetal-mcp-ocata-ovs-ha.openstack
-  # - cluster.baremetal-mcp-ocata-ovs-ha.stacklight
-  # - cluster.baremetal-mcp-ocata-ovs-ha.stacklight.client
+  - cluster.baremetal-mcp-ocata-common.infra
 parameters:
   _param:
-    apt_mk_version: nightly
-    mcp_repo_version: 1.1
-    salt_version: 2016.11
     cluster_name: baremetal-mcp-ocata-ovs-ha
-    cluster_domain: ${_param:cluster_name}.local
-    # 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: ${_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: ${_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:opnfv_vcp_vm_primary_interface}
-    single_nic: ${_param:opnfv_vcp_vm_secondary_interface}
-    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
-
-    # 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}
-        cfg:
-          address: ${_param:infra_config_address}
-          names:
-            - ${_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}
-        kvm01:
-          address: ${_param:infra_kvm_node01_address}
-          names:
-            - ${_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}
-        kvm03:
-          address: ${_param:infra_kvm_node03_address}
-          names:
-            - ${_param:infra_kvm_node03_hostname}
-            - ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}