diff --git a/.gitreview b/.gitreview index 65cb39f4..1f00d473 100644 --- a/.gitreview +++ b/.gitreview @@ -1,4 +1,4 @@ [gerrit] host=review.openstack.org port=29418 -project=stackforge/puppet-designate.git +project=openstack/puppet-designate.git diff --git a/lib/puppet/type/designate_config.rb b/lib/puppet/type/designate_config.rb index 2ea92405..7a45809f 100644 --- a/lib/puppet/type/designate_config.rb +++ b/lib/puppet/type/designate_config.rb @@ -14,6 +14,7 @@ Puppet::Type.newtype(:designate_config) do value.capitalize! if value =~ /^(true|false)$/i value end + newvalues(/^[\S ]*$/) def is_to_s( currentvalue ) if resource.secret? diff --git a/spec/acceptance/basic_designate_spec.rb b/spec/acceptance/basic_designate_spec.rb index 928e234a..abd7eacf 100644 --- a/spec/acceptance/basic_designate_spec.rb +++ b/spec/acceptance/basic_designate_spec.rb @@ -5,6 +5,22 @@ describe 'basic designate' do context 'default parameters' do it 'should work with no errors' do + ppp= <<-EOS + case $::osfamily { + 'Debian': { + Exec { logoutput => 'on_failure' } + package { ['debconf-utils','debconf']: ensure => installed, } -> + exec { 'fix_empty_rabbit_password': + command => '/bin/echo "designate-common designate/rabbit_password password password" | /usr/bin/debconf-set-selections', + unless => '/usr/bin/debconf-get-selections | grep "designate/rabbit_password"', + } + exec { 'fix_empty_keystone_password': + command => '/bin/echo "designate-common designate/admin-password password password" | /usr/bin/debconf-set-selections', + unless => '/usr/bin/debconf-get-selections | grep "designate/admin-password"', + } + } + } + EOS pp= <<-EOS Exec { logoutput => 'on_failure' } @@ -122,7 +138,9 @@ describe 'basic designate' do } EOS - + # TODO : A fix on inifile must be filed, if the value is an empty string, the inifile provider + # configure the value with a newline.https://paste.debian.net/238471/ + apply_manifest(ppp, :catch_failures => true) # Run it once, idempotency does not work # this is what we have each time we run puppet after first time: # http://paste.openstack.org/show/2ebHALkNguNsE0804Oev/