Matanya has uploaded a new change for review.
https://gerrit.wikimedia.org/r/119488
Change subject: openstack: qualify var
......................................................................
openstack: qualify var
Change-Id: If8532a1d11ebc534f01a82e44af3afca4e7ae1e4
---
M manifests/role/nova.pp
1 file changed, 12 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/88/119488/1
diff --git a/manifests/role/nova.pp b/manifests/role/nova.pp
index 7e72f88..8698fd5 100644
--- a/manifests/role/nova.pp
+++ b/manifests/role/nova.pp
@@ -226,7 +226,7 @@
include passwords::misc::scripts
class { "openstack::common":
- openstack_version => $openstack_version,
+ openstack_version => $::openstack_version,
novaconfig => $novaconfig,
instance_status_wiki_host => "wikitech.wikimedia.org",
instance_status_wiki_domain => "labs",
@@ -261,7 +261,7 @@
}
class { "openstack::openstack-manager":
- openstack_version => $openstack_version,
+ openstack_version => $::openstack_version,
novaconfig => $novaconfig,
certificate => $certificate,
}
@@ -287,15 +287,15 @@
include role::nova::common
- if ( $openstack_version == "havana" ) {
- class { "openstack::conductor-service": openstack_version =>
$openstack_version, novaconfig => $novaconfig }
+ if ( $::openstack_version == "havana" ) {
+ class { "openstack::conductor-service": openstack_version =>
$::openstack_version, novaconfig => $novaconfig }
}
- class { "openstack::scheduler-service": openstack_version =>
$openstack_version, novaconfig => $novaconfig }
- class { "openstack::glance-service": openstack_version =>
$openstack_version, glanceconfig => $glanceconfig }
- class { "openstack::queue-server": openstack_version =>
$openstack_version, novaconfig => $novaconfig }
+ class { "openstack::scheduler-service": openstack_version =>
$::openstack_version, novaconfig => $novaconfig }
+ class { "openstack::glance-service": openstack_version =>
$::openstack_version, glanceconfig => $glanceconfig }
+ class { "openstack::queue-server": openstack_version =>
$::openstack_version, novaconfig => $novaconfig }
class { "openstack::firewall": }
class { "openstack::database-server":
- openstack_version => $openstack_version,
+ openstack_version => $::openstack_version,
novaconfig => $novaconfig,
glanceconfig => $glanceconfig,
keystoneconfig => $keystoneconfig,
@@ -349,7 +349,7 @@
include role::nova::common
- class { "openstack::api-service": openstack_version =>
$openstack_version, novaconfig => $novaconfig }
+ class { "openstack::api-service": openstack_version =>
$::openstack_version, novaconfig => $novaconfig }
}
class role::nova::network::bonding {
@@ -376,7 +376,7 @@
down => 'ip link set $IFACE down',
}
- class { "openstack::network-service": openstack_version =>
$openstack_version, novaconfig => $novaconfig }
+ class { "openstack::network-service": openstack_version =>
$::openstack_version, novaconfig => $novaconfig }
}
class role::nova::wikiupdates {
@@ -385,7 +385,7 @@
package { 'python-mwclient': ensure => latest; }
}
- if ($openstack_version == "folsom") {
+ if ($::openstack_version == "folsom") {
package { 'python-openstack-wikistatus':
ensure => installed,
require => Package["python-mwclient"],
@@ -431,7 +431,7 @@
}
}
- class { "openstack::compute-service": openstack_version =>
$openstack_version, novaconfig => $novaconfig }
+ class { "openstack::compute-service": openstack_version =>
$::openstack_version, novaconfig => $novaconfig }
if $realm == "labs" {
include role::nova::api,
--
To view, visit https://gerrit.wikimedia.org/r/119488
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If8532a1d11ebc534f01a82e44af3afca4e7ae1e4
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
