[MediaWiki-commits] [Gerrit] Explicitly set config in openstack template. - change (operations/puppet)

[Giuseppe Lavagetto (Code Review)]

Giuseppe Lavagetto has submitted this change and it was merged.

Change subject: Explicitly set config in openstack template.
......................................................................


Explicitly set config in openstack template.

Removed need for dynamic lookup which is not working in puppet 3.

Change-Id: I64141c5f30c963b636d912f8b5c40669c04872e5
Signed-off-by: Giuseppe Lavagetto <glavage...@wikimedia.org>
---
M manifests/openstack.pp
M manifests/role/keystone.pp
M manifests/role/nova.pp
3 files changed, 6 insertions(+), 6 deletions(-)

Approvals:
  Giuseppe Lavagetto: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/manifests/openstack.pp b/manifests/openstack.pp
index 0bd1f0f..70ceefd 100644
--- a/manifests/openstack.pp
+++ b/manifests/openstack.pp
@@ -252,8 +252,8 @@
     require mysql::server::package
 
     if !defined(Service['mysql']) {
-        service { "mysql":      
-            enable => true,     
+        service { "mysql":
+            enable => true,
             require => Class['mysql::server::package'],
             ensure => running;
         }
@@ -957,7 +957,7 @@
     }
 }
 
-class openstack::keystone-service($openstack_version="folsom", 
$keystoneconfig) {
+class openstack::keystone-service($openstack_version="folsom", 
$keystoneconfig, $glanceconfig) {
     if ! defined(Class["openstack::repo"]) {
         class { "openstack::repo": openstack_version => $openstack_version }
     }
diff --git a/manifests/role/keystone.pp b/manifests/role/keystone.pp
index 3e41e39..61d7e49 100644
--- a/manifests/role/keystone.pp
+++ b/manifests/role/keystone.pp
@@ -64,7 +64,7 @@
     $keystoneconfig = merge($eqiadkeystoneconfig, $commonkeystoneconfig)
 }
 
-class role::keystone::server {
+class role::keystone::server ($glanceconfig) {
     include role::keystone::config::pmtpa,
             role::keystone::config::eqiad
 
@@ -80,7 +80,7 @@
         }
     }
 
-    class { 'openstack::keystone-service': openstack_version => 
$openstack_version, keystoneconfig => $keystoneconfig }
+    class { 'openstack::keystone-service': openstack_version => 
$openstack_version, keystoneconfig => $keystoneconfig, glanceconfig => 
$glanceconfig }
 
     include role::keystone::redis
 }
diff --git a/manifests/role/nova.pp b/manifests/role/nova.pp
index f75cc13..e282561 100644
--- a/manifests/role/nova.pp
+++ b/manifests/role/nova.pp
@@ -318,7 +318,7 @@
                glanceconfig => $glanceconfig,
                keystoneconfig => $keystoneconfig,
        }
-       class { "role::keystone::server": }
+       class { "role::keystone::server": glanceconfig => $glanceconfig}
        if $realm == "production" {
                class { "role::puppet::server::labs": }
        }

-- 
To view, visit https://gerrit.wikimedia.org/r/132934
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I64141c5f30c963b636d912f8b5c40669c04872e5
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits