summaryrefslogtreecommitdiffstats
path: root/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/maas.yml
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-12-04 22:33:53 +0100
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-12-14 22:59:35 +0100
commit2fc4b8890ef1ad456ac1ff421f33e005ae0484be (patch)
treea5ad052a2c9ec3a93d84d767d2b2fa7ff01dce85 /mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/maas.yml
parent9eb05da8bc5618e4b95d396fcc932a7c0abb3bd6 (diff)
[baremetal] Move VCP iface config to own yml
- move linux.network.interface definitions to their own classes, which also removes the previous requirement of defining {dhcp,single}_nic parameters in classes that don't actually use them; - drop now useless {dhcp,single}_nic parameters; - expand linux_{dhcp,single}_interface macros, since they cause issues with reclass dict-merge while attempting to override sub-vars (i.e. it's not possible to set 'enabled: false' via reclass interpolation); JIRA: FUEL-310 Change-Id: I29d921f545e761de335a60e242a4523d13b06c78 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/maas.yml')
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/maas.yml3
1 files changed, 0 insertions, 3 deletions
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/maas.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/maas.yml
index 93db0ed14..56cd96b5b 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/maas.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/maas.yml
@@ -23,9 +23,6 @@ parameters:
maas_db_password: opnfv_secret
dns_server01: ${_param:opnfv_dns_server01}
single_address: ${_param:infra_maas_node01_deploy_address}
- # {dhcp,single}_nic are not used, but referenced
- dhcp_nic: ${_param:opnfv_vcp_vm_primary_interface}
- single_nic: ${_param:opnfv_vcp_vm_secondary_interface}
maas:
region:
salt_master_ip: ${_param:infra_config_deploy_address}