diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-08-05 06:37:12 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-08-10 15:13:12 +0200 |
| commit | 9b38e04de451a60da0bc8a685612282cd1b60ee6 (patch) | |
| tree | 0c7666fe684ed0379d64af1159a1d7958c1f3b3b /mcp/reclass/classes/cluster/mcp-common-noha/infra | |
| parent | 742b27e22c6c22d4ac7f32665b3a4bda35ce252f (diff) | |
[noha] Add mas01 reclass inheritance
While at it, move openstack_version param to the common include dir.
JIRA: FUEL-382
Change-Id: I5e7ebb18a95672f066126d3afd28f13395a3149f
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'mcp/reclass/classes/cluster/mcp-common-noha/infra')
| -rw-r--r-- | mcp/reclass/classes/cluster/mcp-common-noha/infra/config.yml.j2 | 1 | ||||
| -rw-r--r-- | mcp/reclass/classes/cluster/mcp-common-noha/infra/init.yml.j2 (renamed from mcp/reclass/classes/cluster/mcp-common-noha/infra/init.yml) | 19 |
2 files changed, 17 insertions, 3 deletions
diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/infra/config.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-noha/infra/config.yml.j2 index dc31a93ca..36a2c27ec 100644 --- a/mcp/reclass/classes/cluster/mcp-common-noha/infra/config.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-common-noha/infra/config.yml.j2 @@ -13,7 +13,6 @@ classes: parameters: _param: openstack_control_node01_hostname: ctl01 - reclass_config_master: ${_param:opnfv_infra_config_pxe_admin_address} single_address: ${_param:opnfv_infra_config_address} salt_master_host: 127.0.0.1 salt_minion_ca_host: ${linux:network:fqdn} diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/infra/init.yml b/mcp/reclass/classes/cluster/mcp-common-noha/infra/init.yml.j2 index 772d0880b..339d81889 100644 --- a/mcp/reclass/classes/cluster/mcp-common-noha/infra/init.yml +++ b/mcp/reclass/classes/cluster/mcp-common-noha/infra/init.yml.j2 @@ -5,10 +5,18 @@ # which accompanies this distribution, and is available at # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## +{%- import 'net_map.j2' as nm with context %} --- +classes: + - cluster.all-mcp-arch-common parameters: _param: cluster_domain: ${_param:cluster_name}.local + infra_maas_database_password: opnfv_secret + reclass_config_master: ${_param:opnfv_infra_config_pxe_admin_address} + infra_maas_node01_hostname: mas01 + infra_maas_node01_address: ${_param:opnfv_infra_maas_node01_address} + infra_maas_node01_deploy_address: ${_param:opnfv_infra_maas_node01_deploy_address} linux: system: apt: @@ -20,12 +28,19 @@ parameters: network: host: cfg01: - address: ${_param:infra_config_address} + address: ${_param:opnfv_infra_config_address} names: - cfg01 - cfg01.${_param:cluster_domain} cfg: - address: ${_param:infra_config_address} + address: ${_param:opnfv_infra_config_address} names: - cfg - cfg.${_param:cluster_domain} +{%- if nm.cluster.has_baremetal_nodes %} + mas01: + address: ${_param:infra_maas_node01_address} + names: + - ${_param:infra_maas_node01_hostname} + - ${_param:infra_maas_node01_hostname}.${_param:cluster_domain} +{%- endif %} |