diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-10-17 21:39:20 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-10-18 02:42:54 +0000 |
| commit | 3763a5d236413a5a02b8950b5b77eb9bfa75badb (patch) | |
| tree | 3883302441ddaced41dec25d6538789c6f45b4c6 /mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_control.yml | |
| parent | 2c4241c3d04ac1e5f43c701e776ae37684681e63 (diff) | |
[baremetal] reclass: Fix class order for common
Inheriting classes in the wrong order led to params being silently
overriden by defaults in the system reclass classes, leaving
some mismatched values between the controller nova config and the
compute conunterpart (e.g. metadata_password had different values).
Always inherit the common class first, so scenario-specific config
is applied on top.
NOTE: {dhcp,single}_nic are not used for mas|kvm|cmp nodes, but they
are referenced in inherited classes, so keep them for now.
Change-Id: I6cb90d5c832ffc8ab731bd9e3cd38ede858dba5c
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
(cherry picked from commit 92530f89c061b0070766e431f839feb368e2e4ac)
Diffstat (limited to 'mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_control.yml')
| -rw-r--r-- | mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_control.yml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_control.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_control.yml index 0684bd826..2aa05f07d 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_control.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_control.yml @@ -39,6 +39,8 @@ parameters: cluster_node03_hostname: ctl03 cluster_node03_address: ${_param:openstack_control_node03_address} nova_vncproxy_url: https://${_param:cluster_public_host}:6080 + dhcp_nic: ${_param:opnfv_vcp_vm_primary_interface} + single_nic: ${_param:opnfv_vcp_vm_secondary_interface} linux: network: interface: |