diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2019-02-19 15:17:25 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2019-02-19 15:17:25 +0000 |
| commit | 3c34bab9279d5dbe7df3824131e4487e5017ef15 (patch) | |
| tree | 2764cdfd7b9c8d597713d90b7958c6f4bbff8bf0 /mcp/reclass/classes/cluster/mcp-common-noha | |
| parent | 1b2958b0695ebc9e2ba95f782b854540cea42c14 (diff) | |
| parent | 58af9a94ef78bbcf3f0593d4170d32ebce721455 (diff) | |
Merge "[baremetal] Containerize MaaS"
Diffstat (limited to 'mcp/reclass/classes/cluster/mcp-common-noha')
| -rw-r--r-- | mcp/reclass/classes/cluster/mcp-common-noha/infra/init.yml.j2 | 3 | ||||
| -rw-r--r-- | mcp/reclass/classes/cluster/mcp-common-noha/init_options.yml (renamed from mcp/reclass/classes/cluster/mcp-common-noha/init_options.yml.j2) | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/infra/init.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-noha/infra/init.yml.j2 index e1e62981f..d3e07e106 100644 --- a/mcp/reclass/classes/cluster/mcp-common-noha/infra/init.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-common-noha/infra/init.yml.j2 @@ -11,6 +11,9 @@ classes: - cluster.all-mcp-arch-common parameters: _param: + # infra service addresses + infra_config_address: ${_param:opnfv_infra_config_address} + infra_config_deploy_address: {{ conf.SALT_MASTER }} cluster_domain: ${_param:cluster_name}.local reclass_config_master: ${_param:opnfv_infra_config_pxe_admin_address} infra_maas_node01_hostname: mas01 diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/init_options.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-noha/init_options.yml index f59ffac54..4b5a4dec8 100644 --- a/mcp/reclass/classes/cluster/mcp-common-noha/init_options.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-common-noha/init_options.yml @@ -10,9 +10,6 @@ classes: - cluster.all-mcp-arch-common parameters: _param: - # infra service addresses - infra_config_address: ${_param:opnfv_infra_config_address} - infra_config_deploy_address: {{ conf.SALT_MASTER }} # openstack service addresses openstack_control_address: ${_param:opnfv_openstack_control_node01_address} openstack_control_node01_address: ${_param:opnfv_openstack_control_node01_address} |