Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/92839
Change subject: Upstart_job -> Generic::Upstart_job
......................................................................
Upstart_job -> Generic::Upstart_job
I3a5ef3a20 changed the scope of some generic definitions but updated only the
resource definitions, not the requires. Follows Ic076f4a84.
Change-Id: I83e38a07415eac512a4d5a6ccc03bf9d98cddcb6
---
M manifests/openstack.pp
M modules/mediawiki/manifests/twemproxy.pp
2 files changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/39/92839/1
diff --git a/manifests/openstack.pp b/manifests/openstack.pp
index e6ae2e5..5156b94 100644
--- a/manifests/openstack.pp
+++ b/manifests/openstack.pp
@@ -222,7 +222,7 @@
service { "manage-volumes":
enable => true,
ensure => running,
- require => Upstart_job["manage-volumes"];
+ require => Generic::Upstart_job["manage-volumes"];
}
}
@@ -234,7 +234,7 @@
service { "manage-nfs-volumes":
enable => true,
ensure => running,
- require => Upstart_job["manage-nfs-volumes"];
+ require => Generic::Upstart_job["manage-nfs-volumes"];
}
$sudo_privs = [ 'ALL = NOPASSWD: /bin/mkdir -p /srv/*',
diff --git a/modules/mediawiki/manifests/twemproxy.pp
b/modules/mediawiki/manifests/twemproxy.pp
index 4dadcd3..a3ee0da 100644
--- a/modules/mediawiki/manifests/twemproxy.pp
+++ b/modules/mediawiki/manifests/twemproxy.pp
@@ -6,7 +6,7 @@
generic::upstart_job { "twemproxy": install => "true", start => "true" }
service { twemproxy:
- require => [ Package[twemproxy], Upstart_job[twemproxy] ],
+ require => [ Package[twemproxy], Generic::Upstart_job[twemproxy] ],
provider => upstart,
ensure => running;
}
--
To view, visit https://gerrit.wikimedia.org/r/92839
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I83e38a07415eac512a4d5a6ccc03bf9d98cddcb6
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
