Merge "Add roles for gluster cluster"
diff --git a/glusterfs/server/cluster.yml b/glusterfs/server/cluster.yml
index 16453c9..f7c520e 100644
--- a/glusterfs/server/cluster.yml
+++ b/glusterfs/server/cluster.yml
@@ -8,6 +8,7 @@
iptables:
enabled: false
server:
+ role: ${_param:glusterfs_node_role}
peers:
- ${_param:cluster_node01_address}
- ${_param:cluster_node02_address}
diff --git a/reclass/storage/system/cicd_control_cluster.yml b/reclass/storage/system/cicd_control_cluster.yml
index bc31944..34f0de1 100644
--- a/reclass/storage/system/cicd_control_cluster.yml
+++ b/reclass/storage/system/cicd_control_cluster.yml
@@ -18,6 +18,7 @@
single_address: ${_param:cicd_control_node01_address}
keepalived_vip_priority: 103
cicd_database_id: 1
+ glusterfs_node_role: primary
cicd_control_node02:
name: ${_param:cicd_control_node02_hostname}
domain: ${_param:cluster_domain}
@@ -29,6 +30,7 @@
single_address: ${_param:cicd_control_node02_address}
keepalived_vip_priority: 102
cicd_database_id: 2
+ glusterfs_node_role: secondary
cicd_control_node03:
name: ${_param:cicd_control_node03_hostname}
domain: ${_param:cluster_domain}
@@ -40,3 +42,4 @@
single_address: ${_param:cicd_control_node03_address}
keepalived_vip_priority: 101
cicd_database_id: 3
+ glusterfs_node_role: secondary
diff --git a/reclass/storage/system/openstack_control_cluster.yml b/reclass/storage/system/openstack_control_cluster.yml
index e05b3e9..cf21437 100644
--- a/reclass/storage/system/openstack_control_cluster.yml
+++ b/reclass/storage/system/openstack_control_cluster.yml
@@ -20,6 +20,7 @@
opencontrail_database_id: 1
rabbitmq_cluster_role: master
openstack_node_role: primary
+ glusterfs_node_role: primary
openstack_control_node02:
name: ${_param:openstack_control_node02_hostname}
domain: ${_param:cluster_domain}
@@ -33,6 +34,7 @@
opencontrail_database_id: 2
rabbitmq_cluster_role: slave
openstack_node_role: secondary
+ glusterfs_node_role: secondary
openstack_control_node03:
name: ${_param:openstack_control_node03_hostname}
domain: ${_param:cluster_domain}
@@ -46,3 +48,4 @@
opencontrail_database_id: 3
rabbitmq_cluster_role: slave
openstack_node_role: secondary
+ glusterfs_node_role: secondary
diff --git a/reclass/storage/system/openstack_control_large.yml b/reclass/storage/system/openstack_control_large.yml
index 4ad2e90..f02b24c 100644
--- a/reclass/storage/system/openstack_control_large.yml
+++ b/reclass/storage/system/openstack_control_large.yml
@@ -20,6 +20,7 @@
single_address: ${_param:openstack_control_node01_address}
keepalived_vip_priority: 105
openstack_node_role: primary
+ glusterfs_node_role: primary
openstack_control_node02:
name: ${_param:openstack_control_node02_hostname}
domain: ${_param:cluster_domain}
@@ -31,6 +32,7 @@
single_address: ${_param:openstack_control_node02_address}
keepalived_vip_priority: 104
openstack_node_role: secondary
+ glusterfs_node_role: secondary
openstack_control_node03:
name: ${_param:openstack_control_node03_hostname}
domain: ${_param:cluster_domain}
@@ -42,6 +44,7 @@
single_address: ${_param:openstack_control_node03_address}
keepalived_vip_priority: 103
openstack_node_role: secondary
+ glusterfs_node_role: secondary
openstack_control_node04:
name: ${_param:openstack_control_node04_hostname}
domain: ${_param:cluster_domain}
@@ -53,6 +56,7 @@
single_address: ${_param:openstack_control_node04_address}
keepalived_vip_priority: 102
openstack_node_role: secondary
+ glusterfs_node_role: secondary
openstack_control_node05:
name: ${_param:openstack_control_node05_hostname}
domain: ${_param:cluster_domain}
@@ -64,3 +68,4 @@
single_address: ${_param:openstack_control_node05_address}
keepalived_vip_priority: 101
openstack_node_role: secondary
+ glusterfs_node_role: secondary
diff --git a/reclass/storage/system/openstack_control_upgrade_single.yml b/reclass/storage/system/openstack_control_upgrade_single.yml
index b00cc81..a48c9a3 100644
--- a/reclass/storage/system/openstack_control_upgrade_single.yml
+++ b/reclass/storage/system/openstack_control_upgrade_single.yml
@@ -15,3 +15,4 @@
linux_system_codename: ${_param:openstack_upgrade_system_codename}
single_address: ${_param:openstack_upgrade_node01_address}
openstack_node_role: primary
+ glusterfs_node_role: primary
diff --git a/reclass/storage/system/openstack_telemetry_cluster.yml b/reclass/storage/system/openstack_telemetry_cluster.yml
index 4c688a8..198c356 100644
--- a/reclass/storage/system/openstack_telemetry_cluster.yml
+++ b/reclass/storage/system/openstack_telemetry_cluster.yml
@@ -18,6 +18,7 @@
single_address: ${_param:openstack_telemetry_node01_address}
keepalived_vip_priority: 103
openstack_node_role: primary
+ glusterfs_node_role: primary
ceilometer_create_gnocchi_resources: true
redis_cluster_role: 'master'
openstack_telemetry_node02:
@@ -31,6 +32,7 @@
single_address: ${_param:openstack_telemetry_node02_address}
keepalived_vip_priority: 102
openstack_node_role: secondary
+ glusterfs_node_role: secondary
redis_cluster_role: 'slave'
openstack_telemetry_node03:
name: ${_param:openstack_telemetry_node03_hostname}
@@ -43,4 +45,5 @@
single_address: ${_param:openstack_telemetry_node03_address}
keepalived_vip_priority: 101
openstack_node_role: secondary
+ glusterfs_node_role: secondary
redis_cluster_role: 'slave'
diff --git a/reclass/storage/system/oss_cluster.yml b/reclass/storage/system/oss_cluster.yml
index 71d42ce..784d8a7 100644
--- a/reclass/storage/system/oss_cluster.yml
+++ b/reclass/storage/system/oss_cluster.yml
@@ -19,6 +19,7 @@
linux_system_codename: ${_param:oss_system_codename}
single_address: ${_param:oss_node01_address}
keepalived_vip_priority: 103
+ glusterfs_node_role: primary
stacklight_server_node02:
name: ${_param:oss_node02_hostname}
domain: ${_param:cluster_domain}
@@ -30,6 +31,7 @@
linux_system_codename: ${_param:oss_system_codename}
single_address: ${_param:oss_node02_address}
keepalived_vip_priority: 102
+ glusterfs_node_role: secondary
stacklight_server_node03:
name: ${_param:oss_node03_hostname}
domain: ${_param:cluster_domain}
@@ -41,3 +43,4 @@
linux_system_codename: ${_param:oss_system_codename}
single_address: ${_param:oss_node03_address}
keepalived_vip_priority: 101
+ glusterfs_node_role: secondary
diff --git a/reclass/storage/system/physical_control_cluster.yml b/reclass/storage/system/physical_control_cluster.yml
index ebd0eb0..1621a4c 100644
--- a/reclass/storage/system/physical_control_cluster.yml
+++ b/reclass/storage/system/physical_control_cluster.yml
@@ -32,6 +32,7 @@
deploy_address: ${_param:infra_kvm_node01_deploy_address}
public_address: ${_param:infra_kvm_node01_public_address}
storage_address: ${_param:infra_kvm_node01_storage_address}
+ glusterfs_node_role: primary
infra_kvm_node02:
name: ${_param:infra_kvm_node02_hostname}
domain: ${_param:cluster_domain}
@@ -44,6 +45,7 @@
deploy_address: ${_param:infra_kvm_node02_deploy_address}
public_address: ${_param:infra_kvm_node02_public_address}
storage_address: ${_param:infra_kvm_node02_storage_address}
+ glusterfs_node_role: secondary
infra_kvm_node03:
name: ${_param:infra_kvm_node03_hostname}
domain: ${_param:cluster_domain}
@@ -56,3 +58,4 @@
deploy_address: ${_param:infra_kvm_node03_deploy_address}
public_address: ${_param:infra_kvm_node03_public_address}
storage_address: ${_param:infra_kvm_node03_storage_address}
+ glusterfs_node_role: secondary
diff --git a/reclass/storage/system/physical_control_full.yml b/reclass/storage/system/physical_control_full.yml
index 1bdd345..7c3b030 100644
--- a/reclass/storage/system/physical_control_full.yml
+++ b/reclass/storage/system/physical_control_full.yml
@@ -57,6 +57,7 @@
deploy_address: ${_param:infra_kvm_node01_deploy_address}
public_address: ${_param:infra_kvm_node01_public_address}
storage_address: ${_param:infra_kvm_node01_storage_address}
+ glusterfs_node_role: primary
infra_kvm_node02:
name: ${_param:infra_kvm_node02_hostname}
domain: ${_param:cluster_domain}
@@ -69,6 +70,7 @@
deploy_address: ${_param:infra_kvm_node02_deploy_address}
public_address: ${_param:infra_kvm_node02_public_address}
storage_address: ${_param:infra_kvm_node02_storage_address}
+ glusterfs_node_role: secondary
infra_kvm_node03:
name: ${_param:infra_kvm_node03_hostname}
domain: ${_param:cluster_domain}
@@ -81,6 +83,7 @@
deploy_address: ${_param:infra_kvm_node03_deploy_address}
public_address: ${_param:infra_kvm_node03_public_address}
storage_address: ${_param:infra_kvm_node03_storage_address}
+ glusterfs_node_role: secondary
infra_kvm_node04:
name: ${_param:infra_kvm_node04_hostname}
domain: ${_param:cluster_domain}
diff --git a/reclass/storage/system/physical_control_large.yml b/reclass/storage/system/physical_control_large.yml
index 1070f47..93cc565 100644
--- a/reclass/storage/system/physical_control_large.yml
+++ b/reclass/storage/system/physical_control_large.yml
@@ -81,6 +81,7 @@
deploy_address: ${_param:infra_kvm_node01_deploy_address}
public_address: ${_param:infra_kvm_node01_public_address}
storage_address: ${_param:infra_kvm_node01_storage_address}
+ glusterfs_node_role: primary
infra_kvm_node02:
name: ${_param:infra_kvm_node02_hostname}
domain: ${_param:cluster_domain}
@@ -93,6 +94,7 @@
deploy_address: ${_param:infra_kvm_node02_deploy_address}
public_address: ${_param:infra_kvm_node02_public_address}
storage_address: ${_param:infra_kvm_node02_storage_address}
+ glusterfs_node_role: secondary
infra_kvm_node03:
name: ${_param:infra_kvm_node03_hostname}
domain: ${_param:cluster_domain}
@@ -105,6 +107,7 @@
deploy_address: ${_param:infra_kvm_node03_deploy_address}
public_address: ${_param:infra_kvm_node03_public_address}
storage_address: ${_param:infra_kvm_node03_storage_address}
+ glusterfs_node_role: secondary
infra_kvm_node04:
name: ${_param:infra_kvm_node04_hostname}
domain: ${_param:cluster_domain}
diff --git a/reclass/storage/system/physical_control_medium.yml b/reclass/storage/system/physical_control_medium.yml
index 5ad7d24..70d7313 100644
--- a/reclass/storage/system/physical_control_medium.yml
+++ b/reclass/storage/system/physical_control_medium.yml
@@ -69,6 +69,7 @@
deploy_address: ${_param:infra_kvm_node01_deploy_address}
public_address: ${_param:infra_kvm_node01_public_address}
storage_address: ${_param:infra_kvm_node01_storage_address}
+ glusterfs_node_role: primary
infra_kvm_node02:
name: ${_param:infra_kvm_node02_hostname}
domain: ${_param:cluster_domain}
@@ -81,6 +82,7 @@
deploy_address: ${_param:infra_kvm_node02_deploy_address}
public_address: ${_param:infra_kvm_node02_public_address}
storage_address: ${_param:infra_kvm_node02_storage_address}
+ glusterfs_node_role: secondary
infra_kvm_node03:
name: ${_param:infra_kvm_node03_hostname}
domain: ${_param:cluster_domain}
@@ -93,6 +95,7 @@
deploy_address: ${_param:infra_kvm_node03_deploy_address}
public_address: ${_param:infra_kvm_node03_public_address}
storage_address: ${_param:infra_kvm_node03_storage_address}
+ glusterfs_node_role: secondary
infra_kvm_node04:
name: ${_param:infra_kvm_node04_hostname}
domain: ${_param:cluster_domain}
diff --git a/reclass/storage/system/physical_control_small.yml b/reclass/storage/system/physical_control_small.yml
index 4ce3759..5727dd6 100644
--- a/reclass/storage/system/physical_control_small.yml
+++ b/reclass/storage/system/physical_control_small.yml
@@ -45,6 +45,7 @@
deploy_address: ${_param:infra_kvm_node01_deploy_address}
public_address: ${_param:infra_kvm_node01_public_address}
storage_address: ${_param:infra_kvm_node01_storage_address}
+ glusterfs_node_role: primary
infra_kvm_node02:
name: ${_param:infra_kvm_node02_hostname}
domain: ${_param:cluster_domain}
@@ -57,6 +58,7 @@
deploy_address: ${_param:infra_kvm_node02_deploy_address}
public_address: ${_param:infra_kvm_node02_public_address}
storage_address: ${_param:infra_kvm_node02_storage_address}
+ glusterfs_node_role: secondary
infra_kvm_node03:
name: ${_param:infra_kvm_node03_hostname}
domain: ${_param:cluster_domain}
@@ -69,6 +71,7 @@
deploy_address: ${_param:infra_kvm_node03_deploy_address}
public_address: ${_param:infra_kvm_node03_public_address}
storage_address: ${_param:infra_kvm_node03_storage_address}
+ glusterfs_node_role: secondary
infra_kvm_node04:
name: ${_param:infra_kvm_node04_hostname}
domain: ${_param:cluster_domain}