Fix beaker on Trusty and update .gitreview file
* Update .gitreview file because of Puppet OpenStack modules project renaming. * Fix Beaker tests on Ubuntu Trusty (newline added if secret) We have to do that in a single patch because: * project has been renamed so gitreview needs to be updated * beaker jobs are voting Co-Authored-By: Jeremy Stanley <fungi@yuggoth.org> Co-Authored-By: Emilien Macchi <emilien@redhat.com> Co-Authored-By: Sebastien Badia <sbadia@redhat.com> Closes-Bug: #1465780 Change-Id: If562aa5bc969c316fd8fd0cb06ed7115c465a57d
This commit is contained in:
parent
b3953185b6
commit
fb9af2b3a2
|
@ -1,4 +1,4 @@
|
||||||
[gerrit]
|
[gerrit]
|
||||||
host=review.openstack.org
|
host=review.openstack.org
|
||||||
port=29418
|
port=29418
|
||||||
project=stackforge/puppet-designate.git
|
project=openstack/puppet-designate.git
|
||||||
|
|
|
@ -14,6 +14,7 @@ Puppet::Type.newtype(:designate_config) do
|
||||||
value.capitalize! if value =~ /^(true|false)$/i
|
value.capitalize! if value =~ /^(true|false)$/i
|
||||||
value
|
value
|
||||||
end
|
end
|
||||||
|
newvalues(/^[\S ]*$/)
|
||||||
|
|
||||||
def is_to_s( currentvalue )
|
def is_to_s( currentvalue )
|
||||||
if resource.secret?
|
if resource.secret?
|
||||||
|
|
|
@ -5,6 +5,22 @@ describe 'basic designate' do
|
||||||
context 'default parameters' do
|
context 'default parameters' do
|
||||||
|
|
||||||
it 'should work with no errors' 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
|
pp= <<-EOS
|
||||||
Exec { logoutput => 'on_failure' }
|
Exec { logoutput => 'on_failure' }
|
||||||
|
|
||||||
|
@ -122,7 +138,9 @@ describe 'basic designate' do
|
||||||
}
|
}
|
||||||
EOS
|
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
|
# Run it once, idempotency does not work
|
||||||
# this is what we have each time we run puppet after first time:
|
# this is what we have each time we run puppet after first time:
|
||||||
# http://paste.openstack.org/show/2ebHALkNguNsE0804Oev/
|
# http://paste.openstack.org/show/2ebHALkNguNsE0804Oev/
|
||||||
|
|
Loading…
Reference in New Issue