summaryrefslogtreecommitdiffstats
path: root/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-10-17 21:39:20 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-10-18 02:42:54 +0000
commit3763a5d236413a5a02b8950b5b77eb9bfa75badb (patch)
tree3883302441ddaced41dec25d6538789c6f45b4c6 /mcp/reclass/classes/cluster/baremetal-mcp-ocata-common
parent2c4241c3d04ac1e5f43c701e776ae37684681e63 (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')
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/init.yml2
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml3
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/maas.yml3
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml3
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_control.yml2
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_dashboard.yml2
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_database.yml2
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_message_queue.yml2
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_proxy.yml2
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_telemetry.yml2
10 files changed, 21 insertions, 2 deletions
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}
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml
index aca416e94..0e973d495 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml
@@ -36,6 +36,9 @@ parameters:
keepalived_vip_virtual_router_id: 69
loopback_device_size: 20
linux_system_codename: xenial
+ # {dhcp,single}_nic are not used, but referenced
+ dhcp_nic: ${_param:opnfv_vcp_vm_primary_interface}
+ single_nic: ${_param:opnfv_vcp_vm_secondary_interface}
glusterfs:
client:
volumes:
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:
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_dashboard.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_dashboard.yml
index f6143e876..e082d2681 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_dashboard.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_dashboard.yml
@@ -11,6 +11,8 @@ classes:
parameters:
_param:
horizon_site_branding: OpenStack Dashboard
+ dhcp_nic: ${_param:opnfv_vcp_vm_primary_interface}
+ single_nic: ${_param:opnfv_vcp_vm_secondary_interface}
linux:
network:
interface:
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_database.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_database.yml
index 2a25eab35..7ed588d9b 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_database.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_database.yml
@@ -35,6 +35,8 @@ parameters:
cluster_node02_address: ${_param:openstack_database_node02_address}
cluster_node03_hostname: dbs03
cluster_node03_address: ${_param:openstack_database_node03_address}
+ dhcp_nic: ${_param:opnfv_vcp_vm_primary_interface}
+ single_nic: ${_param:opnfv_vcp_vm_secondary_interface}
linux:
network:
interface:
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_message_queue.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_message_queue.yml
index 04e45e832..88affb84a 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_message_queue.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_message_queue.yml
@@ -23,6 +23,8 @@ parameters:
cluster_node02_address: ${_param:openstack_message_queue_node02_address}
cluster_node03_hostname: msg03
cluster_node03_address: ${_param:openstack_message_queue_node03_address}
+ dhcp_nic: ${_param:opnfv_vcp_vm_primary_interface}
+ single_nic: ${_param:opnfv_vcp_vm_secondary_interface}
linux:
network:
interface:
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_proxy.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_proxy.yml
index 343937103..da3190815 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_proxy.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_proxy.yml
@@ -30,6 +30,8 @@ parameters:
mode: secure
cluster_vip_address: ${_param:openstack_proxy_address}
salt_minion_ca_host: cfg01.${_param:cluster_domain}
+ dhcp_nic: ${_param:opnfv_vcp_vm_primary_interface}
+ single_nic: ${_param:opnfv_vcp_vm_secondary_interface}
linux:
network:
interface:
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_telemetry.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_telemetry.yml
index cffe04c6a..c52b5ed79 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_telemetry.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_telemetry.yml
@@ -28,6 +28,8 @@ parameters:
cluster_node02_address: ${_param:openstack_telemetry_node02_address}
cluster_node03_hostname: mdb03
cluster_node03_address: ${_param:openstack_telemetry_node03_address}
+ dhcp_nic: ${_param:opnfv_vcp_vm_primary_interface}
+ single_nic: ${_param:opnfv_vcp_vm_secondary_interface}
linux:
network:
interface: