Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

designate: allow worker on cluster. #2104

Merged
merged 2 commits into from
Jun 12, 2019
Merged

designate: allow worker on cluster. #2104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a0a0877
designate: allow worker on cluster.
Apr 15, 2019
6ee734c
designate: do not use pacemaker as all the services are stateless
Apr 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions chef/cookbooks/designate/definitions/designate_service.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
define :designate_service do
designate_service_name = "designate-#{params[:name]}"
ha_enabled = node[:designate][:ha][:enabled]
use_crowbar_pacemaker_service = ha_enabled && node[:pacemaker][:clone_stateless_services]

package "openstack-designate-#{params[:name]}"

Expand All @@ -25,9 +24,8 @@
supports status: true, restart: true
action [:enable, :start]
subscribes :restart, resources(template: node[:designate][:config_file])
provider Chef::Provider::CrowbarPacemakerService if use_crowbar_pacemaker_service
end
utils_systemd_service_restart designate_service_name do
action use_crowbar_pacemaker_service ? :disable : :enable
:enable
end
end
2 changes: 1 addition & 1 deletion crowbar_framework/app/models/designate_service.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ def role_constraints
"designate-worker" => {
"unique" => false,
"count" => 1,
"cluster" => false,
"cluster" => true,
"admin" => false,
"exclude_platform" => {
"suse" => "< 12.4",
Expand Down