diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-12-04 22:33:53 +0100 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-12-31 02:12:00 +0100 |
| commit | bcc13c53a58f4e7df800e13a4775432fe3b5395f (patch) | |
| tree | 7ad2f661c2bb3d634fcc7325ee01e2d6e9147322 /mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_control.yml | |
| parent | 154ac4bbb6dd35ed69cb3fce35cf3854a5229202 (diff) | |
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>
(cherry picked from commit 2fc4b8890ef1ad456ac1ff421f33e005ae0484be)
Diffstat (limited to 'mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_control.yml')
| -rw-r--r-- | mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_control.yml | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_control.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_control.yml index ce82807ce..9bf04f090 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_control.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_control.yml @@ -41,13 +41,6 @@ parameters: cluster_node03_address: ${_param:openstack_control_node03_address} nova_vncproxy_url: https://${_param:cluster_public_host}:6080 glusterfs_version: '3.10' - dhcp_nic: ${_param:opnfv_vcp_vm_primary_interface} - single_nic: ${_param:opnfv_vcp_vm_secondary_interface} - linux: - network: - interface: - dhcp: ${_param:linux_dhcp_interface} - single: ${_param:linux_single_interface} neutron: server: vlan_aware_vms: true |