From 3763a5d236413a5a02b8950b5b77eb9bfa75badb Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Tue, 17 Oct 2017 21:39:20 +0200 Subject: [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 Signed-off-by: Michael Polenchuk (cherry picked from commit 92530f89c061b0070766e431f839feb368e2e4ac) --- mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/init.yml | 2 -- mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml | 3 +++ mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/maas.yml | 3 +++ 3 files changed, 6 insertions(+), 2 deletions(-) (limited to 'mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra') diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/init.yml index 467a45c22..a96e254df 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/init.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/init.yml @@ -50,8 +50,6 @@ parameters: storage: node: name: default - dhcp_nic: ${_param:opnfv_vcp_vm_primary_interface} - single_nic: ${_param:opnfv_vcp_vm_secondary_interface} linux_dhcp_interface: enabled: true type: eth diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml index ce81f4272..3bd705c6c 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml @@ -32,6 +32,9 @@ parameters: keepalived_vip_interface: br-ctl keepalived_vip_virtual_router_id: 69 deploy_nic: ${_param:opnfv_baremetal_primary_nic} + # {dhcp,single}_nic are not used, but referenced + dhcp_nic: ${_param:opnfv_vcp_vm_primary_interface} + single_nic: ${_param:opnfv_vcp_vm_secondary_interface} salt: control: size: # RAM 4096,8192,16384,32768,65536 diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/maas.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/maas.yml index fb5d1cf93..e8c2965f7 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/maas.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/maas.yml @@ -23,6 +23,9 @@ 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} -- cgit 1.2.3-korg