diff --git a/metadata.json b/metadata.json index 0d85ee62..5b1d98b5 100644 --- a/metadata.json +++ b/metadata.json @@ -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" }, diff --git a/spec/acceptance/basic_designate_spec.rb b/spec/acceptance/basic_designate_spec.rb index aa41c605..039331b3 100644 --- a/spec/acceptance/basic_designate_spec.rb +++ b/spec/acceptance/basic_designate_spec.rb @@ -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/