Merge "acceptance: Remove dirty fix for empty values (fixed in inifile module)"
This commit is contained in:
commit
9a2083b46a
|
@ -31,7 +31,7 @@
|
||||||
],
|
],
|
||||||
"description": "Installs and configures OpenStack Designate (DNS Services).",
|
"description": "Installs and configures OpenStack Designate (DNS Services).",
|
||||||
"dependencies": [
|
"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": "openstack/keystone", "version_requirement": ">=6.0.0 <7.0.0" },
|
||||||
{ "name": "puppetlabs/stdlib", "version_requirement": ">=4.0.0 <5.0.0" },
|
{ "name": "puppetlabs/stdlib", "version_requirement": ">=4.0.0 <5.0.0" },
|
||||||
{ "name": "theforeman/dns", "version_requirement": ">=1.4.0 <4.0.0" },
|
{ "name": "theforeman/dns", "version_requirement": ">=1.4.0 <4.0.0" },
|
||||||
|
|
|
@ -5,22 +5,6 @@ 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' }
|
||||||
|
|
||||||
|
@ -129,9 +113,6 @@ 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