Andrew Bogott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/233058
Change subject: Revert "Add root keypair connecting labvirt hosts."
......................................................................
Revert "Add root keypair connecting labvirt hosts."
This doesn't work -- pub keys have to be in /etc/ssh.
This reverts commit 6dc1195d3f2ede2f11492fcba251a87c2452fb40.
Change-Id: I86af18822d141e224ca376c37036a53d942d5823
---
M modules/openstack/manifests/adminscripts.pp
M modules/openstack/manifests/nova/compute.pp
2 files changed, 0 insertions(+), 18 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/58/233058/1
diff --git a/modules/openstack/manifests/adminscripts.pp
b/modules/openstack/manifests/adminscripts.pp
index a759337..7b09a98 100644
--- a/modules/openstack/manifests/adminscripts.pp
+++ b/modules/openstack/manifests/adminscripts.pp
@@ -96,10 +96,4 @@
group => 'nova',
mode => '0600',
}
- file { '/root/.ssh/novamigrate':
- content => secret('ssh/nova/novamigrate'),
- owner => 'root',
- group => 'root',
- mode => '0600',
- }
}
diff --git a/modules/openstack/manifests/nova/compute.pp
b/modules/openstack/manifests/nova/compute.pp
index 52b5301..4dff6e5 100644
--- a/modules/openstack/manifests/nova/compute.pp
+++ b/modules/openstack/manifests/nova/compute.pp
@@ -56,18 +56,6 @@
mode => '0600',
require => File['/var/lib/nova/.ssh'],
}
- file { '/root/.ssh/novamigrate.pub':
- content => secret('ssh/nova/novamigrate.pub'),
- owner => 'root',
- group => 'root',
- mode => '0600',
- }
- file { '/root/.ssh/novamigrate':
- content => secret('ssh/nova/novamigrate'),
- owner => 'root',
- group => 'root',
- mode => '0600',
- }
file { '/etc/libvirt/libvirtd.conf':
notify => Service['libvirt-bin'],
owner => 'root',
--
To view, visit https://gerrit.wikimedia.org/r/233058
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I86af18822d141e224ca376c37036a53d942d5823
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
