openstack/puppet-openstack-integration
Code Issues Proposed changes

Actually run service validation for designate

Browse Source 
The service validation for designate-central was set to refreshonly but
did not have anything actually notifying it to run. This change updates
the validation to listen for the designate::service::end anchor so that
we will wait for the service to be up before trying to manage the pools.

Change-Id: Ife6b29388e97112666ad5602ac62ac7d8534c1d5
Closes-Bug: #1671206
This commit is contained in:
Alex Schultz 2017-03-08 12:25:56 -07:00
parent 676221cbc0
commit e5d468a42c
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
manifests/designate.pp
View File

@ -98,13 +98,6 @@ class openstack_integration::designate {
rndc_key_file => $::dns::params::rndckeypath, rndc_key_file => $::dns::params::rndckeypath,
} }
# TODO: Implement pools.yaml management in puppet-designate
file { '/etc/designate/pools.yaml':
ensure => present,
content => template("${module_name}/pools.yaml.erb"),
require => Service['designate-central'],
}
# Validate that designate-central is ready for pool update # Validate that designate-central is ready for pool update
$command = "openstack --os-auth-url ${::openstack_integration::config::keystone_auth_uri} \ $command = "openstack --os-auth-url ${::openstack_integration::config::keystone_auth_uri} \
--os-project-name services --os-username designate --os-password a_big_secret zone list" --os-project-name services --os-username designate --os-password a_big_secret zone list"
@ -112,6 +105,14 @@ class openstack_integration::designate {
command => $command, command => $command,
timeout => '15', timeout => '15',
refreshonly => true, refreshonly => true,
subscribe => Anchor['designate::service::end'],
}
# TODO: Implement pools.yaml management in puppet-designate
file { '/etc/designate/pools.yaml':
ensure => present,
content => template("${module_name}/pools.yaml.erb"),
require => Service['designate-central'],
} }
exec { 'Update designate pools': exec { 'Update designate pools':
@ -120,6 +121,6 @@ class openstack_integration::designate {
refreshonly => true, refreshonly => true,
logoutput => 'on_failure', logoutput => 'on_failure',
subscribe => File['/etc/designate/pools.yaml'], subscribe => File['/etc/designate/pools.yaml'],
require => Anchor['create designate-central anchor'], require => Openstacklib::Service_validation['designate-central'],
} }
} }