Revert "Fix priority parameters for VIP instances"
This reverts commit 7db6d6a79bbc131efd026aad8c2f62bfb6737e95.
Change-Id: Ia5b10482d0fd06671dfb46569ec68d15099a5ea7
diff --git a/keepalived/cluster/instance/openstack_telemetry_vip.yml b/keepalived/cluster/instance/openstack_telemetry_vip.yml
index 41f7dd0..91155e7 100644
--- a/keepalived/cluster/instance/openstack_telemetry_vip.yml
+++ b/keepalived/cluster/instance/openstack_telemetry_vip.yml
@@ -7,7 +7,6 @@
keepalived_openstack_telemetry_vip_address: ${_param:cluster_vip_address}
keepalived_openstack_telemetry_vip_password: password
keepalived_openstack_telemetry_vip_interface: eth1
- keepalived_openstack_telemetry_vip_priority: 101
keepalived:
cluster:
enabled: true
@@ -17,4 +16,4 @@
password: ${_param:keepalived_openstack_telemetry_vip_password}
interface: ${_param:keepalived_openstack_telemetry_vip_interface}
virtual_router_id: 230
- priority: ${_param:keepalived_openstack_telemetry_vip_priority}
+ priority: 101
diff --git a/keepalived/cluster/instance/stacklight_log_vip.yml b/keepalived/cluster/instance/stacklight_log_vip.yml
index 1a36121..caa6754 100644
--- a/keepalived/cluster/instance/stacklight_log_vip.yml
+++ b/keepalived/cluster/instance/stacklight_log_vip.yml
@@ -3,8 +3,6 @@
classes:
- service.keepalived.support
parameters:
- _param:
- keepalived_stacklight_log_vip_priority: 101
keepalived:
cluster:
enabled: true
@@ -14,4 +12,4 @@
password: ${_param:keepalived_stacklight_log_vip_password}
interface: ${_param:keepalived_stacklight_log_vip_interface}
virtual_router_id: 110
- priority: ${_param:keepalived_stacklight_log_vip_priority}
+ priority: 101
diff --git a/keepalived/cluster/instance/stacklight_monitor_vip.yml b/keepalived/cluster/instance/stacklight_monitor_vip.yml
index 05eb967..28a6b69 100644
--- a/keepalived/cluster/instance/stacklight_monitor_vip.yml
+++ b/keepalived/cluster/instance/stacklight_monitor_vip.yml
@@ -3,8 +3,6 @@
classes:
- service.keepalived.support
parameters:
- _param:
- keepalived_stacklight_monitor_vip_priority: 101
keepalived:
cluster:
enabled: true
@@ -14,4 +12,4 @@
password: ${_param:keepalived_stacklight_monitor_vip_password}
interface: ${_param:keepalived_stacklight_monitor_vip_interface}
virtual_router_id: 100
- priority: ${_param:keepalived_stacklight_monitor_vip_priority}
+ priority: 101
diff --git a/keepalived/cluster/instance/stacklight_telemetry_vip.yml b/keepalived/cluster/instance/stacklight_telemetry_vip.yml
index 160a02e..e7d31a5 100644
--- a/keepalived/cluster/instance/stacklight_telemetry_vip.yml
+++ b/keepalived/cluster/instance/stacklight_telemetry_vip.yml
@@ -3,8 +3,6 @@
classes:
- service.keepalived.support
parameters:
- _param:
- keepalived_stacklight_telemetry_vip_priority: 101
keepalived:
cluster:
enabled: true
@@ -14,4 +12,4 @@
password: ${_param:keepalived_stacklight_telemetry_vip_password}
interface: ${_param:keepalived_stacklight_telemetry_vip_interface}
virtual_router_id: 120
- priority: ${_param:keepalived_stacklight_telemetry_vip_priority}
+ priority: 101
diff --git a/reclass/storage/system/openstack_telemetry_cluster.yml b/reclass/storage/system/openstack_telemetry_cluster.yml
index 986ed61..d184fc9 100644
--- a/reclass/storage/system/openstack_telemetry_cluster.yml
+++ b/reclass/storage/system/openstack_telemetry_cluster.yml
@@ -15,7 +15,7 @@
salt_master_host: ${_param:reclass_config_master}
linux_system_codename: trusty
single_address: ${_param:openstack_telemetry_node01_address}
- keepalived_openstack_telemetry_vip_priority: 103
+ keepalived_vip_priority: 103
openstack_telemetry_node02:
name: ${_param:openstack_telemetry_node02_hostname}
domain: ${_param:cluster_domain}
@@ -25,7 +25,7 @@
salt_master_host: ${_param:reclass_config_master}
linux_system_codename: trusty
single_address: ${_param:openstack_telemetry_node02_address}
- keepalived_openstack_telemetry_vip_priority: 102
+ keepalived_vip_priority: 102
openstack_telemetry_node03:
name: ${_param:openstack_telemetry_node03_hostname}
domain: ${_param:cluster_domain}
@@ -35,4 +35,4 @@
salt_master_host: ${_param:reclass_config_master}
linux_system_codename: trusty
single_address: ${_param:openstack_telemetry_node03_address}
- keepalived_openstack_telemetry_vip_priority: 101
+ keepalived_vip_priority: 101
diff --git a/reclass/storage/system/stacklight_monitor_cluster.yml b/reclass/storage/system/stacklight_monitor_cluster.yml
index 80f57cf..f95cf81 100644
--- a/reclass/storage/system/stacklight_monitor_cluster.yml
+++ b/reclass/storage/system/stacklight_monitor_cluster.yml
@@ -17,7 +17,7 @@
salt_master_host: ${_param:reclass_config_master}
linux_system_codename: xenial
single_address: ${_param:stacklight_monitor_node01_address}
- keepalived_stacklight_monitor_vip_priority: 103
+ keepalived_vip_priority: 103
stacklight_monitor_node02:
name: ${_param:stacklight_monitor_node02_hostname}
domain: ${_param:cluster_domain}
@@ -29,7 +29,7 @@
salt_master_host: ${_param:reclass_config_master}
linux_system_codename: xenial
single_address: ${_param:stacklight_monitor_node02_address}
- keepalived_stacklight_monitor_vip_priority: 102
+ keepalived_vip_priority: 102
stacklight_monitor_node03:
name: ${_param:stacklight_monitor_node03_hostname}
domain: ${_param:cluster_domain}
@@ -41,4 +41,4 @@
salt_master_host: ${_param:reclass_config_master}
linux_system_codename: xenial
single_address: ${_param:stacklight_monitor_node03_address}
- keepalived_stacklight_monitor_vip_priority: 101
+ keepalived_vip_priority: 101
diff --git a/reclass/storage/system/stacklight_server_cluster.yml b/reclass/storage/system/stacklight_server_cluster.yml
index 818e732..26b9ebe 100644
--- a/reclass/storage/system/stacklight_server_cluster.yml
+++ b/reclass/storage/system/stacklight_server_cluster.yml
@@ -20,7 +20,7 @@
salt_master_host: ${_param:reclass_config_master}
linux_system_codename: xenial
single_address: ${_param:stacklight_monitor_node01_address}
- keepalived_stacklight_monitor_vip_priority: 103
+ keepalived_vip_priority: 103
rabbitmq_cluster_role: master
stacklight_server_node02:
name: ${_param:stacklight_monitor_node02_hostname}
@@ -33,7 +33,7 @@
salt_master_host: ${_param:reclass_config_master}
linux_system_codename: xenial
single_address: ${_param:stacklight_monitor_node02_address}
- keepalived_stacklight_monitor_vip_priority: 102
+ keepalived_vip_priority: 102
rabbitmq_cluster_role: slave
stacklight_server_node03:
name: ${_param:stacklight_monitor_node03_hostname}
@@ -46,5 +46,5 @@
salt_master_host: ${_param:reclass_config_master}
linux_system_codename: xenial
single_address: ${_param:stacklight_monitor_node03_address}
- keepalived_stacklight_monitor_vip_priority: 101
+ keepalived_vip_priority: 101
rabbitmq_cluster_role: slave
diff --git a/reclass/storage/system/stacklight_telemetry_cluster.yml b/reclass/storage/system/stacklight_telemetry_cluster.yml
index c75d93d..12b1dae 100644
--- a/reclass/storage/system/stacklight_telemetry_cluster.yml
+++ b/reclass/storage/system/stacklight_telemetry_cluster.yml
@@ -15,7 +15,7 @@
salt_master_host: ${_param:reclass_config_master}
linux_system_codename: xenial
single_address: ${_param:stacklight_telemetry_node01_address}
- keepalived_stacklight_telemetry_vip_priority: 103
+ keepalived_vip_priority: 103
stacklight_telemetry_node02:
name: ${_param:stacklight_telemetry_node02_hostname}
domain: ${_param:cluster_domain}
@@ -25,7 +25,7 @@
salt_master_host: ${_param:reclass_config_master}
linux_system_codename: xenial
single_address: ${_param:stacklight_telemetry_node02_address}
- keepalived_stacklight_telemetry_vip_priority: 102
+ keepalived_vip_priority: 102
stacklight_telemetry_node03:
name: ${_param:stacklight_telemetry_node03_hostname}
domain: ${_param:cluster_domain}
@@ -35,4 +35,4 @@
salt_master_host: ${_param:reclass_config_master}
linux_system_codename: xenial
single_address: ${_param:stacklight_telemetry_node03_address}
- keepalived_stacklight_telemetry_vip_priority: 101
+ keepalived_vip_priority: 101