Merge "Remove old ssh_authorized_key resources"

This commit is contained in:
Jenkins 2017-04-12 18:36:38 +00:00 committed by Gerrit Code Review
commit b3f8b4106c

View File

@ -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':
ensure => present,
user => 'root',
@ -178,10 +165,6 @@ class openstack_project::template (
],
require => File['/root/.ssh'],
}
ssh_authorized_key { '/root/.ssh/authorized_keys':
ensure => absent,
user => 'root',
}
if ($::osfamily == 'Debian') {
# NOTE(pabelanger): Puppetlabs only support Ubuntu Trusty and below,