Andrew Bogott has submitted this change and it was merged.
Change subject: Move generic::gluster* into a module
......................................................................
Move generic::gluster* into a module
Change-Id: I71d21d78176958f7c1b77b6b7a53740e37d2f3ac
---
M manifests/generic-definitions.pp
M manifests/misc/download.pp
M manifests/openstack.pp
M modules/base/manifests/init.pp
R modules/gluster/files/glusterd-default
R modules/gluster/files/glusterd.vol
R modules/gluster/files/glusterfs-server
R modules/gluster/files/glusterlogs
A modules/gluster/manifests/client.pp
A modules/gluster/manifests/server.pp
A modules/gluster/manifests/service.pp
11 files changed, 82 insertions(+), 70 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/generic-definitions.pp b/manifests/generic-definitions.pp
index 43d6b2f..f67f16e 100644
--- a/manifests/generic-definitions.pp
+++ b/manifests/generic-definitions.pp
@@ -147,39 +147,6 @@
}
}
-class generic::gluster-client {
-
- package { "glusterfs-client":
- ensure => present;
- }
-
- file { [ '/var/log/glusterfs', '/var/log/glusterfs/bricks' ]:
- ensure => directory,
- before => File['/etc/logrotate.d/glusterlogs'],
- }
-
- file { "/etc/logrotate.d/glusterlogs":
- ensure => present,
- mode => '0664',
- source => "puppet:///files/logrotate/glusterlogs",
- owner => 'root',
- }
-
- # Gluster installs this but it doesn't work and breaks
- # the behavior of /etc/logrotate.d/glusterlogs.
- file { "/etc/logrotate.d/glusterfs-common":
- ensure => absent,
- }
-}
-
-class generic::gluster-server {
-
- package { "glusterfs-server":
- ensure => present;
- }
-
-}
-
class generic::packages::ant18 {
if ($::lsbdistcodename == "lucid") {
diff --git a/manifests/misc/download.pp b/manifests/misc/download.pp
index 7ddfd26..ca94655 100644
--- a/manifests/misc/download.pp
+++ b/manifests/misc/download.pp
@@ -144,7 +144,7 @@
class misc::download-gluster {
include role::mirror::common
- include generic::gluster-client
+ include gluster::client
system_role { "misc::download-gluster": description => "Gluster dumps
copy" }
diff --git a/manifests/openstack.pp b/manifests/openstack.pp
index 64a9e91..e14edfb 100644
--- a/manifests/openstack.pp
+++ b/manifests/openstack.pp
@@ -245,7 +245,7 @@
}
class openstack::project-storage {
- include openstack::gluster-service
+ include gluster::service
$sudo_privs = [ 'ALL = NOPASSWD: /bin/mkdir -p /a/*',
'ALL = NOPASSWD: /bin/rmdir /a/*',
@@ -279,40 +279,6 @@
mode => 0700,
require => Systemuser["glustermanager"];
}
-}
-
-class openstack::gluster-service {
- include generic::gluster-client,
- generic::gluster-server
-
- service { "glusterfs-server":
- enable => true,
- ensure => running,
- require => [Package["glusterfs-server"],
File["/etc/init.d/glusterfs-server"], File["/etc/default/glusterd"],
File["/etc/glusterfs/glusterd.vol"]];
- }
- file {
- "/etc/init.d/glusterfs-server":
- owner => root,
- group => root,
- mode => 0555,
- source => "puppet:///files/gluster/glusterfs-server",
- require => [Package["glusterfs-server"]];
- "/etc/default/glusterd":
- owner => root,
- group => root,
- mode => 0444,
- source => "puppet:///files/gluster/glusterd-default",
- require => [Package["glusterfs-server"]];
- "/etc/glusterfs/glusterd.vol":
- owner => root,
- group => root,
- mode => 0644,
- source => "puppet:///files/gluster/glusterd.vol",
- require => [Package["glusterfs-server"]];
- "/etc/init/glusterfs-server.conf":
- ensure => absent;
- }
-
}
class openstack::database-server($openstack_version="folsom", $novaconfig,
$keystoneconfig, $glanceconfig) {
diff --git a/modules/base/manifests/init.pp b/modules/base/manifests/init.pp
index 5e6747f..c5a1fe1 100644
--- a/modules/base/manifests/init.pp
+++ b/modules/base/manifests/init.pp
@@ -435,7 +435,7 @@
if $::realm == "labs" {
include base::instance-upstarts,
- generic::gluster-client
+ gluster::client
# Storage backend to use for /home & /data/project
# Configured on a per project basis inside puppet since we do not have
any
diff --git a/files/gluster/glusterd-default
b/modules/gluster/files/glusterd-default
similarity index 100%
rename from files/gluster/glusterd-default
rename to modules/gluster/files/glusterd-default
diff --git a/files/gluster/glusterd.vol b/modules/gluster/files/glusterd.vol
similarity index 100%
rename from files/gluster/glusterd.vol
rename to modules/gluster/files/glusterd.vol
diff --git a/files/gluster/glusterfs-server
b/modules/gluster/files/glusterfs-server
similarity index 100%
rename from files/gluster/glusterfs-server
rename to modules/gluster/files/glusterfs-server
diff --git a/files/logrotate/glusterlogs b/modules/gluster/files/glusterlogs
similarity index 100%
rename from files/logrotate/glusterlogs
rename to modules/gluster/files/glusterlogs
diff --git a/modules/gluster/manifests/client.pp
b/modules/gluster/manifests/client.pp
new file mode 100644
index 0000000..783f2e9
--- /dev/null
+++ b/modules/gluster/manifests/client.pp
@@ -0,0 +1,30 @@
+# gluster::client
+#
+# Installs gluster client packages, sets up logging.
+#
+# We also do some logrotate magic to work around a bug in gluster's
+# native log-rotate.
+#
+class gluster::client {
+ package { 'glusterfs-client':
+ ensure => present;
+ }
+
+ file { [ '/var/log/glusterfs', '/var/log/glusterfs/bricks' ]:
+ ensure => directory,
+ before => File['/etc/logrotate.d/glusterlogs'],
+ }
+
+ file { '/etc/logrotate.d/glusterlogs':
+ ensure => present,
+ mode => '0664',
+ source => 'puppet:///modules/gluster/glusterlogs',
+ owner => 'root',
+ }
+
+ # Gluster installs this but it doesn't work and breaks
+ # the behavior of /etc/logrotate.d/glusterlogs.
+ file { '/etc/logrotate.d/glusterfs-common':
+ ensure => absent,
+ }
+}
diff --git a/modules/gluster/manifests/server.pp
b/modules/gluster/manifests/server.pp
new file mode 100644
index 0000000..9305b8b
--- /dev/null
+++ b/modules/gluster/manifests/server.pp
@@ -0,0 +1,13 @@
+# gluster::server
+#
+# Install the glusterfs server package.
+#
+# This doesn't do any config work at the moment.
+#
+class gluster::server {
+
+ package { 'glusterfs-server':
+ ensure => present;
+ }
+
+}
diff --git a/modules/gluster/manifests/service.pp
b/modules/gluster/manifests/service.pp
new file mode 100644
index 0000000..d24c542
--- /dev/null
+++ b/modules/gluster/manifests/service.pp
@@ -0,0 +1,36 @@
+class gluster::service {
+ include gluster::client,
+ gluster::server
+
+ service { 'glusterfs-server':
+ ensure => running,
+ enable => true,
+ require => [Package['glusterfs-server'],
+ File['/etc/init.d/glusterfs-server',
+ '/etc/default/glusterd',
+ '/etc/glusterfs/glusterd.vol']];
+ }
+ file {
+ '/etc/init.d/glusterfs-server':
+ owner => root,
+ group => root,
+ mode => '0555',
+ source => 'puppet:///modules/gluster/glusterfs-server',
+ require => [Package['glusterfs-server']];
+ '/etc/default/glusterd':
+ owner => root,
+ group => root,
+ mode => '0444',
+ source => 'puppet:///modules/gluster/glusterd-default',
+ require => [Package['glusterfs-server']];
+ '/etc/glusterfs/glusterd.vol':
+ owner => root,
+ group => root,
+ mode => '0644',
+ source => 'puppet:///modules/gluster/glusterd.vol',
+ require => [Package['glusterfs-server']];
+ '/etc/init/glusterfs-server.conf':
+ ensure => absent;
+ }
+
+}
--
To view, visit https://gerrit.wikimedia.org/r/91884
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I71d21d78176958f7c1b77b6b7a53740e37d2f3ac
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Ryan Lane <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
