designate: cleanup producer HA deployment (SOC-9766)

The previous PR merged before I managed to push up some fixes to silence Hound, and correct the sync marks.
crowbar · Sep 9, 2019 · 2520d73 · 2520d73
1 parent 35d1327
commit 2520d73
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/chef/cookbooks/designate/recipes/api.rb b/chef/cookbooks/designate/recipes/api.rb
@@ -16,8 +16,6 @@
 # Recipe:: api
 #
 
-package "openstack-designate-producer"
-
 keystone_settings = KeystoneHelper.keystone_settings(node, @cookbook_name)
 
 designate_port = node[:designate][:api][:bind_port]

diff --git a/chef/cookbooks/designate/recipes/ha.rb b/chef/cookbooks/designate/recipes/ha.rb
@@ -33,20 +33,22 @@
   action :nothing
 end.run_action(:create)
 
-op = {}
-op["monitor"] = {}
-op["monitor"]["interval"] = "10s"
+crowbar_pacemaker_sync_mark "wait-designate_producer"
 
-designate_producer_primitive = "designate-producer"
-pacemaker_primitive designate_producer_primitive do
+package "openstack-designate-producer"
+
+op = { "monitor" => { "interval" => "10s" }}
+
+producer_primitive = "designate-producer"
+pacemaker_primitive producer_primitive do
   agent "systemd:openstack-designate-producer"
   op op
   action :update
   only_if { CrowbarPacemakerHelper.is_cluster_founder?(node) }
 end
-service_transaction_objects << "pacemaker_primitive[#{designate_producer_primitive}]"
+service_transaction_objects << "pacemaker_primitive[#{producer_primitive}]"
 
-designate_producer_loc = openstack_pacemaker_controller_only_location_for designate_producer_primitive
+designate_producer_loc = openstack_pacemaker_controller_only_location_for producer_primitive
 service_transaction_objects << "pacemaker_location[#{designate_producer_loc}]"
 
 pacemaker_transaction "designate producer service" do