Remove old puppet.conf resource in bootstrap class
This is no longer used and can thus be removed. Change-Id: If7aa3781c0cfc44c1744e4d7f5ba235ed5eb0054
This commit is contained in:
parent
bdcc72efb4
commit
ae0b8a6772
|
@ -159,15 +159,6 @@ class keystone::bootstrap (
|
|||
})
|
||||
}
|
||||
|
||||
# NOTE(tkajinam): puppet.conf is no longer required and now clouds.yaml
|
||||
# is used instead.
|
||||
# TODO(tkajinam): Remove this after Y release.
|
||||
file { '/etc/keystone/puppet.conf':
|
||||
ensure => 'absent',
|
||||
require => Anchor['keystone::config::begin'],
|
||||
before => Anchor['keystone::config::end'],
|
||||
}
|
||||
|
||||
$auth_url_real = $interface ? {
|
||||
'admin' => $admin_url,
|
||||
'internal' => $internal_url_real,
|
||||
|
|
|
@ -70,12 +70,6 @@ describe 'keystone::bootstrap' do
|
|||
:internal_url => 'http://127.0.0.1:5000',
|
||||
)}
|
||||
|
||||
it { is_expected.to contain_file('/etc/keystone/puppet.conf').with(
|
||||
:ensure => 'absent',
|
||||
:require => 'Anchor[keystone::config::begin]',
|
||||
:before => 'Anchor[keystone::config::end]',
|
||||
)}
|
||||
|
||||
it { is_expected.to contain_file('/etc/openstack').with(
|
||||
:ensure => 'directory',
|
||||
:mode => '0755',
|
||||
|
@ -180,12 +174,6 @@ describe 'keystone::bootstrap' do
|
|||
:internal_url => 'http://internal:1342',
|
||||
)}
|
||||
|
||||
it { is_expected.to contain_file('/etc/keystone/puppet.conf').with(
|
||||
:ensure => 'absent',
|
||||
:require => 'Anchor[keystone::config::begin]',
|
||||
:before => 'Anchor[keystone::config::end]',
|
||||
)}
|
||||
|
||||
it { is_expected.to contain_file('/etc/openstack').with(
|
||||
:ensure => 'directory',
|
||||
:mode => '0755',
|
||||
|
@ -231,12 +219,6 @@ describe 'keystone::bootstrap' do
|
|||
it { is_expected.to_not contain_keystone_service('keystone::identity') }
|
||||
it { is_expected.to_not contain_keystone_endpoint('RegionOne/keystone::identity') }
|
||||
|
||||
it { is_expected.to contain_file('/etc/keystone/puppet.conf').with(
|
||||
:ensure => 'absent',
|
||||
:require => 'Anchor[keystone::config::begin]',
|
||||
:before => 'Anchor[keystone::config::end]',
|
||||
)}
|
||||
|
||||
it { is_expected.to contain_file('/etc/openstack').with(
|
||||
:ensure => 'directory',
|
||||
:mode => '0755',
|
||||
|
|
Loading…
Reference in New Issue