Merge "Remove old ssh_authorized_key resources"
This commit is contained in:
commit
b3f8b4106c
@ -155,19 +155,6 @@ class openstack_project::template (
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
ssh_authorized_key { 'puppet-remote-2014-04-17':
|
|
||||||
ensure => absent,
|
|
||||||
user => 'root',
|
|
||||||
}
|
|
||||||
ssh_authorized_key { 'puppet-remote-2014-05-24':
|
|
||||||
ensure => absent,
|
|
||||||
user => 'root',
|
|
||||||
}
|
|
||||||
ssh_authorized_key { 'puppet-remote-2014-09-11':
|
|
||||||
ensure => absent,
|
|
||||||
user => 'root',
|
|
||||||
}
|
|
||||||
|
|
||||||
ssh_authorized_key { 'puppet-remote-2014-09-15':
|
ssh_authorized_key { 'puppet-remote-2014-09-15':
|
||||||
ensure => present,
|
ensure => present,
|
||||||
user => 'root',
|
user => 'root',
|
||||||
@ -178,10 +165,6 @@ class openstack_project::template (
|
|||||||
],
|
],
|
||||||
require => File['/root/.ssh'],
|
require => File['/root/.ssh'],
|
||||||
}
|
}
|
||||||
ssh_authorized_key { '/root/.ssh/authorized_keys':
|
|
||||||
ensure => absent,
|
|
||||||
user => 'root',
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($::osfamily == 'Debian') {
|
if ($::osfamily == 'Debian') {
|
||||||
# NOTE(pabelanger): Puppetlabs only support Ubuntu Trusty and below,
|
# NOTE(pabelanger): Puppetlabs only support Ubuntu Trusty and below,
|
||||||
|
Loading…
Reference in New Issue
Block a user