[MediaWiki-commits] [Gerrit] openstack::common bit of refactor - change (operations/puppet)

[Rush (Code Review)]

Rush has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/252864

Change subject: openstack::common bit of refactor
......................................................................

openstack::common bit of refactor

Change-Id: Id8ece185749b7bdca1473acd303d3b5e39928ee9
---
M modules/openstack/manifests/common.pp
1 file changed, 16 insertions(+), 22 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/64/252864/1

diff --git a/modules/openstack/manifests/common.pp 
b/modules/openstack/manifests/common.pp
index c4a3ccd..861f92f 100644
--- a/modules/openstack/manifests/common.pp
+++ b/modules/openstack/manifests/common.pp
@@ -10,23 +10,24 @@
             $instance_status_wiki_pass,
             $openstack_version=$::openstack::version,
             ) {
+
     include openstack::repo
 
-    package { [ 'nova-common', 'python-keystone' ]:
-        ensure  => present,
-        require => Class['openstack::repo'];
-    }
-
-    package { [ 'unzip', 'vblade-persist', 'python-mysqldb', 'bridge-utils', 
'ebtables', 'mysql-common' ]:
-        ensure  => present,
-        require => Class['openstack::repo'];
-    }
-
-    require mysql
-
-    # For IPv6 support
-    package { [ 'python-netaddr', 'radvd' ]:
-        ensure  => present,
+    package { [
+            'unzip',
+            'nova-common',
+            'vblade-persist',
+            'bridge-utils',
+            'ebtables',
+            'mysql-common',
+            'mysql-client-5.5',
+            'python-mysqldb',
+            'python-netaddr',
+            'python-keystone',
+            'python-novaclient',
+            'radvd',
+        ]:
+        ensure => present,
         require => Class['openstack::repo'];
     }
 
@@ -37,18 +38,11 @@
             group   => 'nogroup',
             mode    => '0440',
             require => Package['nova-common'];
-    }
-
-    file {
         '/etc/nova/api-paste.ini':
             content => 
template("openstack/${$openstack_version}/nova/api-paste.ini.erb"),
             owner   => 'nova',
             group   => 'nogroup',
             mode    => '0440',
             require => Package['nova-common'];
-    }
-
-    package { 'python-novaclient':
-        ensure => present,
     }
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id8ece185749b7bdca1473acd303d3b5e39928ee9
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Rush <r...@wikimedia.org>

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