Andrew Bogott has submitted this change and it was merged.
Change subject: Require ::openstack before the common role
......................................................................
Require ::openstack before the common role
That should get openstack::version in scope
Change-Id: I5ae7b13c3ecd33ed50dec8f8003f0664964f7903
---
M modules/role/manifests/labs/openstack/nova/common.pp
1 file changed, 2 insertions(+), 7 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/role/manifests/labs/openstack/nova/common.pp
b/modules/role/manifests/labs/openstack/nova/common.pp
index 276c0ad..24bcf34 100644
--- a/modules/role/manifests/labs/openstack/nova/common.pp
+++ b/modules/role/manifests/labs/openstack/nova/common.pp
@@ -1,6 +1,7 @@
class role::labs::openstack::nova::common {
-
+ require openstack
include passwords::misc::scripts
+ include ::openstack::nova::hooks
$novaconfig_pre = hiera_hash('novaconfig', {})
$keystoneconfig = hiera_hash('keystoneconfig', {})
@@ -27,11 +28,5 @@
class { '::openstack::common':
novaconfig => $novaconfig,
wikitechstatusconfig => $wikitechstatusconfig,
- openstack_version => hiera('openstack::version'),
- }
-
- class { '::openstack::nova::hooks':
- openstack_version => hiera('openstack::version'),
}
}
-
--
To view, visit https://gerrit.wikimedia.org/r/323113
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5ae7b13c3ecd33ed50dec8f8003f0664964f7903
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <abog...@wikimedia.org>
Gerrit-Reviewer: Andrew Bogott <abog...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
