openstack
/
puppet-designate
Code Issues Proposed changes

Merge "acceptance: Remove dirty fix for empty values (fixed in inifile module)"

This commit is contained in:
Jenkins 2015-08-04 12:42:27 +00:00 committed by Gerrit Code Review
parent 5a37cc8127 37644e946f
commit 9a2083b46a
2 changed files with 1 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
metadata.json
View File

@ -31,7 +31,7 @@
],
"description": "Installs and configures OpenStack Designate (DNS Services).",
"dependencies": [
{ "name": "puppetlabs/inifile", "version_requirement": ">=1.0.0 <2.0.0" },
{ "name": "puppetlabs/inifile", "version_requirement": ">=1.4.0 <2.0.0" },
{ "name": "openstack/keystone", "version_requirement": ">=6.0.0 <7.0.0" },
{ "name": "puppetlabs/stdlib", "version_requirement": ">=4.0.0 <5.0.0" },
{ "name": "theforeman/dns", "version_requirement": ">=1.4.0 <4.0.0" },

19
spec/acceptance/basic_designate_spec.rb
View File

@ -5,22 +5,6 @@ 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' }
@ -129,9 +113,6 @@ 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/