Rush has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/398121 )
Change subject: openstack: dependency changes for require_package
......................................................................
openstack: dependency changes for require_package
* labsaliaser.pp does not need client packages
as they are part of clientlib base
* admin_scripts portions that require context
will be moved to another manifest
Bug: T171494
Change-Id: I8b8ae7b00309bd86e96a850af644ad5e00db3ab1
---
M modules/dnsrecursor/manifests/labsaliaser.pp
M modules/openstack/manifests/util/admin_scripts.pp
2 files changed, 0 insertions(+), 6 deletions(-)
Approvals:
Rush: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/dnsrecursor/manifests/labsaliaser.pp
b/modules/dnsrecursor/manifests/labsaliaser.pp
index 7461e61..fa6c2fb 100644
--- a/modules/dnsrecursor/manifests/labsaliaser.pp
+++ b/modules/dnsrecursor/manifests/labsaliaser.pp
@@ -8,8 +8,6 @@
$puppetmaster_hostname,
) {
- require_package(['python-novaclient', 'python-keystoneclient'])
-
$config = {
'username' => $username,
'password' => $password,
diff --git a/modules/openstack/manifests/util/admin_scripts.pp
b/modules/openstack/manifests/util/admin_scripts.pp
index f29a172..f3a6ecf 100644
--- a/modules/openstack/manifests/util/admin_scripts.pp
+++ b/modules/openstack/manifests/util/admin_scripts.pp
@@ -3,7 +3,6 @@
$version,
) {
- require openstack::nova::common
# Installing this package ensures that we have all the UIDs that
# are used to store an instance volume. That's important for
# when we rsync files via this host.
@@ -112,10 +111,7 @@
# XXX: per deployment?
file { '/root/.ssh/compute-hosts-key':
content => secret('ssh/nova/nova.key'),
- owner => 'nova',
- group => 'nova',
mode => '0600',
- require => Package['nova-common'],
show_diff => false,
}
--
To view, visit https://gerrit.wikimedia.org/r/398121
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8b8ae7b00309bd86e96a850af644ad5e00db3ab1
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Rush <r...@wikimedia.org>
Gerrit-Reviewer: Rush <r...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
