Add openstack_node_role parameter
Add openstack_node_role parameter that will specify node role
primary|secondary. This metadata will be used by formulas as a
trigger to run one-shot operations.
Change-Id: I230590bc5f9d53960c6edaf7e37c44541d9c3342
Related-Prod: PROD-21267
diff --git a/reclass/storage/system/openstack_baremetal_cluster.yml b/reclass/storage/system/openstack_baremetal_cluster.yml
index 71f6034..ff6592f 100644
--- a/reclass/storage/system/openstack_baremetal_cluster.yml
+++ b/reclass/storage/system/openstack_baremetal_cluster.yml
@@ -21,6 +21,7 @@
single_address: ${_param:openstack_baremetal_node01_address}
keepalived_vip_priority: 101
baremetal_address: ${_param:openstack_baremetal_node01_baremetal_address}
+ openstack_node_role: primary
openstack_baremetal_node02:
name: ${_param:openstack_baremetal_node02_hostname}
domain: ${_param:cluster_domain}
@@ -32,6 +33,7 @@
single_address: ${_param:openstack_baremetal_node02_address}
keepalived_vip_priority: 102
baremetal_address: ${_param:openstack_baremetal_node02_baremetal_address}
+ openstack_node_role: secondary
openstack_baremetal_node03:
name: ${_param:openstack_baremetal_node03_hostname}
domain: ${_param:cluster_domain}
@@ -43,5 +45,6 @@
single_address: ${_param:openstack_baremetal_node03_address}
keepalived_vip_priority: 103
baremetal_address: ${_param:openstack_baremetal_node03_baremetal_address}
+ openstack_node_role: secondary
diff --git a/reclass/storage/system/openstack_baremetal_single.yml b/reclass/storage/system/openstack_baremetal_single.yml
index 3b279b0..36e89d3 100644
--- a/reclass/storage/system/openstack_baremetal_single.yml
+++ b/reclass/storage/system/openstack_baremetal_single.yml
@@ -14,3 +14,4 @@
linux_system_codename: ${_param:linux_system_codename}
single_address: ${_param:openstack_baremetal_node01_address}
baremetal_address: ${_param:openstack_baremetal_node01_baremetal_address}
+ openstack_node_role: primary
diff --git a/reclass/storage/system/openstack_control_cluster.yml b/reclass/storage/system/openstack_control_cluster.yml
index 300a04c..e05b3e9 100644
--- a/reclass/storage/system/openstack_control_cluster.yml
+++ b/reclass/storage/system/openstack_control_cluster.yml
@@ -19,6 +19,7 @@
keepalived_vip_priority: 103
opencontrail_database_id: 1
rabbitmq_cluster_role: master
+ openstack_node_role: primary
openstack_control_node02:
name: ${_param:openstack_control_node02_hostname}
domain: ${_param:cluster_domain}
@@ -31,6 +32,7 @@
keepalived_vip_priority: 102
opencontrail_database_id: 2
rabbitmq_cluster_role: slave
+ openstack_node_role: secondary
openstack_control_node03:
name: ${_param:openstack_control_node03_hostname}
domain: ${_param:cluster_domain}
@@ -43,3 +45,4 @@
keepalived_vip_priority: 101
opencontrail_database_id: 3
rabbitmq_cluster_role: slave
+ openstack_node_role: secondary
diff --git a/reclass/storage/system/openstack_control_large.yml b/reclass/storage/system/openstack_control_large.yml
index 842e133..4ad2e90 100644
--- a/reclass/storage/system/openstack_control_large.yml
+++ b/reclass/storage/system/openstack_control_large.yml
@@ -19,6 +19,7 @@
linux_system_codename: ${_param:openstack_control_system_codename}
single_address: ${_param:openstack_control_node01_address}
keepalived_vip_priority: 105
+ openstack_node_role: primary
openstack_control_node02:
name: ${_param:openstack_control_node02_hostname}
domain: ${_param:cluster_domain}
@@ -29,6 +30,7 @@
linux_system_codename: ${_param:openstack_control_system_codename}
single_address: ${_param:openstack_control_node02_address}
keepalived_vip_priority: 104
+ openstack_node_role: secondary
openstack_control_node03:
name: ${_param:openstack_control_node03_hostname}
domain: ${_param:cluster_domain}
@@ -39,6 +41,7 @@
linux_system_codename: ${_param:openstack_control_system_codename}
single_address: ${_param:openstack_control_node03_address}
keepalived_vip_priority: 103
+ openstack_node_role: secondary
openstack_control_node04:
name: ${_param:openstack_control_node04_hostname}
domain: ${_param:cluster_domain}
@@ -49,6 +52,7 @@
linux_system_codename: ${_param:openstack_control_system_codename}
single_address: ${_param:openstack_control_node04_address}
keepalived_vip_priority: 102
+ openstack_node_role: secondary
openstack_control_node05:
name: ${_param:openstack_control_node05_hostname}
domain: ${_param:cluster_domain}
@@ -59,3 +63,4 @@
linux_system_codename: ${_param:openstack_control_system_codename}
single_address: ${_param:openstack_control_node05_address}
keepalived_vip_priority: 101
+ openstack_node_role: secondary
diff --git a/reclass/storage/system/openstack_control_single.yml b/reclass/storage/system/openstack_control_single.yml
index e7329da..fe5c870 100644
--- a/reclass/storage/system/openstack_control_single.yml
+++ b/reclass/storage/system/openstack_control_single.yml
@@ -14,3 +14,4 @@
salt_master_host: ${_param:reclass_config_master}
linux_system_codename: ${_param:openstack_control_system_codename}
single_address: ${_param:openstack_control_node01_address}
+ openstack_node_role: primary
diff --git a/reclass/storage/system/openstack_control_upgrade_single.yml b/reclass/storage/system/openstack_control_upgrade_single.yml
index e387062..b00cc81 100644
--- a/reclass/storage/system/openstack_control_upgrade_single.yml
+++ b/reclass/storage/system/openstack_control_upgrade_single.yml
@@ -14,3 +14,4 @@
salt_master_host: ${_param:reclass_config_master}
linux_system_codename: ${_param:openstack_upgrade_system_codename}
single_address: ${_param:openstack_upgrade_node01_address}
+ openstack_node_role: primary
diff --git a/reclass/storage/system/openstack_telemetry_cluster.yml b/reclass/storage/system/openstack_telemetry_cluster.yml
index 9dc6457..c33a8db 100644
--- a/reclass/storage/system/openstack_telemetry_cluster.yml
+++ b/reclass/storage/system/openstack_telemetry_cluster.yml
@@ -17,6 +17,7 @@
linux_system_codename: ${_param:openstack_telemetry_system_codename}
single_address: ${_param:openstack_telemetry_node01_address}
keepalived_vip_priority: 103
+ openstack_node_role: primary
openstack_telemetry_node02:
name: ${_param:openstack_telemetry_node02_hostname}
domain: ${_param:cluster_domain}
@@ -27,6 +28,7 @@
linux_system_codename: ${_param:openstack_telemetry_system_codename}
single_address: ${_param:openstack_telemetry_node02_address}
keepalived_vip_priority: 102
+ openstack_node_role: secondary
openstack_telemetry_node03:
name: ${_param:openstack_telemetry_node03_hostname}
domain: ${_param:cluster_domain}
@@ -37,3 +39,4 @@
linux_system_codename: ${_param:openstack_telemetry_system_codename}
single_address: ${_param:openstack_telemetry_node03_address}
keepalived_vip_priority: 101
+ openstack_node_role: secondary