Faidon has submitted this change and it was merged.
Change subject: Ceph: fix a bunch of dependencies
......................................................................
Ceph: fix a bunch of dependencies
Missing requires, plus fixing brainfart with opposite class
dependencies.
Change-Id: I0e0a447f40bc57f0903b9b09847d1283f2d07945
---
M modules/ceph/manifests/mds.pp
M modules/ceph/manifests/mon.pp
M modules/ceph/manifests/osd.pp
M modules/ceph/manifests/radosgw.pp
4 files changed, 17 insertions(+), 10 deletions(-)
Approvals:
Faidon: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ceph/manifests/mds.pp b/modules/ceph/manifests/mds.pp
index 4aeee73..0b6fd27 100644
--- a/modules/ceph/manifests/mds.pp
+++ b/modules/ceph/manifests/mds.pp
@@ -1,5 +1,5 @@
class ceph::mds {
- Class['ceph::mds'] -> Class['ceph']
+ Class['ceph'] -> Class['ceph::mds']
ceph::bootstrap_key { 'ceph-mds':
type => 'mds',
diff --git a/modules/ceph/manifests/mon.pp b/modules/ceph/manifests/mon.pp
index 46a54df..9aea6be 100644
--- a/modules/ceph/manifests/mon.pp
+++ b/modules/ceph/manifests/mon.pp
@@ -1,7 +1,7 @@
class ceph::mon(
$monitor_secret,
) {
- Class['ceph::mon'] -> Class['ceph']
+ Class['ceph'] -> Class['ceph::mon']
$cluster = 'ceph'
$mon_data = "/var/lib/ceph/mon/ceph-${::hostname}"
diff --git a/modules/ceph/manifests/osd.pp b/modules/ceph/manifests/osd.pp
index da334dd..2050c5c 100644
--- a/modules/ceph/manifests/osd.pp
+++ b/modules/ceph/manifests/osd.pp
@@ -1,5 +1,5 @@
class ceph::osd {
- Class['ceph::osd'] -> Class['ceph']
+ Class['ceph'] -> Class['ceph::osd']
package { ['parted', 'gdisk' ]:
ensure => present,
diff --git a/modules/ceph/manifests/radosgw.pp
b/modules/ceph/manifests/radosgw.pp
index 05df7aa..754e3a7 100644
--- a/modules/ceph/manifests/radosgw.pp
+++ b/modules/ceph/manifests/radosgw.pp
@@ -2,7 +2,7 @@
$servername='localhost',
$serveradmin='webmaster@localhost',
) {
- Class['ceph::radosgw'] -> Class['ceph']
+ Class['ceph'] -> Class['ceph::radosgw']
package { [ 'radosgw', 'radosgw-dbg' ]:
ensure => present,
@@ -11,8 +11,10 @@
service { 'radosgw id=radosgw':
ensure => 'running',
hasrestart => true,
- hasstatus => true,
+ # upstart status is broken with id= ...
+ status => '/usr/bin/pgrep radosgw',
provider => 'upstart',
+ require => Package['radosgw'],
}
$id = 'client.radosgw'
@@ -43,7 +45,11 @@
file { '/etc/apache2/sites-available/radosgw':
ensure => present,
content => template('ceph/radosgw/vhost.erb'),
- require => Package['apache2'],
+ require => [
+ Package['apache2'],
+ Apache::Mod['fastcgi'],
+ Apache::Mod['rewrite'],
+ ],
notify => Service['apache2'],
}
file { '/etc/apache2/sites-enabled/radosgw':
@@ -59,11 +65,12 @@
}
file { '/var/www/monitoring':
- ensure => directory,
+ ensure => directory,
+ require => Package['apache2'],
}
file { '/var/www/monitoring/frontend':
- ensure => present,
- content => "OK\n",
- require => File['/var/www/monitoring'],
+ ensure => present,
+ content => "OK\n",
+ require => File['/var/www/monitoring'],
}
}
--
To view, visit https://gerrit.wikimedia.org/r/61044
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0e0a447f40bc57f0903b9b09847d1283f2d07945
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon <fai...@wikimedia.org>
Gerrit-Reviewer: Faidon <fai...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
