[MediaWiki-commits] [Gerrit] Fix gridengine class to be parametrized - change (operations/puppet)

2013-04-29 Thread coren (Code Review) 
coren has uploaded a new change for review.

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


Change subject: Fix gridengine class to be parametrized
..

Fix gridengine class to be parametrized

Remove reliance on a global variable for configuration (but
keep the global as default for transition purposes)

Change-Id: I844113e7c073a30b3afd200d2970a0cb311e44ff
---
M modules/gridengine/manifests/exec_host.pp
M modules/gridengine/manifests/init.pp
M modules/gridengine/manifests/master.pp
M modules/gridengine/manifests/shadow_master.pp
M modules/gridengine/manifests/submit_host.pp
M modules/gridengine/templates/gridengine.preseed.erb
6 files changed, 9 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/77/61377/1

diff --git a/modules/gridengine/manifests/exec_host.pp 
b/modules/gridengine/manifests/exec_host.pp
index 31fa11d..2a5a9a4 100644
--- a/modules/gridengine/manifests/exec_host.pp
+++ b/modules/gridengine/manifests/exec_host.pp
@@ -1,7 +1,7 @@
 # gridengine/exec_host.pp
 
-class gridengine::exec_host {
-   require gridengine
+class gridengine::exec_host($gridmaster = $grid_master) {
+   require gridengine($gridmaster)
 
 package { gridengine-exec:
 ensure = latest,
diff --git a/modules/gridengine/manifests/init.pp 
b/modules/gridengine/manifests/init.pp
index 83e235f..427050d 100644
--- a/modules/gridengine/manifests/init.pp
+++ b/modules/gridengine/manifests/init.pp
@@ -1,7 +1,7 @@
 # gridengine/init.pp
 
 
-class gridengine {
+class gridengine($gridmaster) {
file { /var/local/preseed:
mode = 0600,
ensure = directory,
diff --git a/modules/gridengine/manifests/master.pp 
b/modules/gridengine/manifests/master.pp
index 2cc885e..29fc749 100644
--- a/modules/gridengine/manifests/master.pp
+++ b/modules/gridengine/manifests/master.pp
@@ -2,7 +2,7 @@
 
 
 class gridengine::master {
-   require gridengine
+   require gridengine($fqdn)
 
 package { gridengine-master:
 ensure = latest,
diff --git a/modules/gridengine/manifests/shadow_master.pp 
b/modules/gridengine/manifests/shadow_master.pp
index 8f30f0e..b80712b 100644
--- a/modules/gridengine/manifests/shadow_master.pp
+++ b/modules/gridengine/manifests/shadow_master.pp
@@ -1,8 +1,8 @@
 # gridengine.pp
 
 
-class gridengine::shadow_master {
-   require gridengine
+class gridengine::shadow_master($gridmaster = $grid_master) {
+   require gridengine($gridmaster)
 
 package { gridengine-master:
 ensure = latest,
diff --git a/modules/gridengine/manifests/submit_host.pp 
b/modules/gridengine/manifests/submit_host.pp
index af092d8..767d6f5 100644
--- a/modules/gridengine/manifests/submit_host.pp
+++ b/modules/gridengine/manifests/submit_host.pp
@@ -1,8 +1,8 @@
 # gridengine.pp
 
 
-class gridengine::submit_host {
-   require gridengine
+class gridengine::submit_host($gridmaster = $grid_master) {
+   require gridengine($gridmaster)
 
 package { gridengine-client:
 ensure = latest,
diff --git a/modules/gridengine/templates/gridengine.preseed.erb 
b/modules/gridengine/templates/gridengine.preseed.erb
index 1f57df1..e41e5fc 100644
--- a/modules/gridengine/templates/gridengine.preseed.erb
+++ b/modules/gridengine/templates/gridengine.preseed.erb
@@ -1,3 +1,3 @@
 gridengine-common shared/gridenginecell string default
 gridengine-common shared/gridengineconfig boolean true
-gridengine-common shared/gridenginemaster string %= grid_master %
+gridengine-common shared/gridenginemaster string %= gridmaster %

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I844113e7c073a30b3afd200d2970a0cb311e44ff
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: coren mpellet...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Fix gridengine class to be parametrized - change (operations/puppet)

2013-04-29 Thread Andrew Bogott (Code Review) 
Andrew Bogott has submitted this change and it was merged.

Change subject: Fix gridengine class to be parametrized
..


Fix gridengine class to be parametrized

Remove reliance on a global variable for configuration (but
keep the global as default for transition purposes)

Change-Id: I844113e7c073a30b3afd200d2970a0cb311e44ff
---
M modules/gridengine/manifests/exec_host.pp
M modules/gridengine/manifests/init.pp
M modules/gridengine/manifests/master.pp
M modules/gridengine/manifests/shadow_master.pp
M modules/gridengine/manifests/submit_host.pp
M modules/gridengine/templates/gridengine.preseed.erb
6 files changed, 13 insertions(+), 10 deletions(-)

Approvals:
  Andrew Bogott: Verified; Looks good to me, approved



diff --git a/modules/gridengine/manifests/exec_host.pp 
b/modules/gridengine/manifests/exec_host.pp
index 31fa11d..2a5a9a4 100644
--- a/modules/gridengine/manifests/exec_host.pp
+++ b/modules/gridengine/manifests/exec_host.pp
@@ -1,7 +1,7 @@
 # gridengine/exec_host.pp
 
-class gridengine::exec_host {
-   require gridengine
+class gridengine::exec_host($gridmaster = $grid_master) {
+   require gridengine($gridmaster)
 
 package { gridengine-exec:
 ensure = latest,
diff --git a/modules/gridengine/manifests/init.pp 
b/modules/gridengine/manifests/init.pp
index 83e235f..6e44287 100644
--- a/modules/gridengine/manifests/init.pp
+++ b/modules/gridengine/manifests/init.pp
@@ -1,7 +1,10 @@
 # gridengine/init.pp
+#
+# The gridmaster parameter is used in the template to preseed the package
+# installation with the (annoyingly) semi-hardcoded FQDN to the grid
+# master server.
 
-
-class gridengine {
+class gridengine($gridmaster) {
file { /var/local/preseed:
mode = 0600,
ensure = directory,
diff --git a/modules/gridengine/manifests/master.pp 
b/modules/gridengine/manifests/master.pp
index 2cc885e..29fc749 100644
--- a/modules/gridengine/manifests/master.pp
+++ b/modules/gridengine/manifests/master.pp
@@ -2,7 +2,7 @@
 
 
 class gridengine::master {
-   require gridengine
+   require gridengine($fqdn)
 
 package { gridengine-master:
 ensure = latest,
diff --git a/modules/gridengine/manifests/shadow_master.pp 
b/modules/gridengine/manifests/shadow_master.pp
index 8f30f0e..b80712b 100644
--- a/modules/gridengine/manifests/shadow_master.pp
+++ b/modules/gridengine/manifests/shadow_master.pp
@@ -1,8 +1,8 @@
 # gridengine.pp
 
 
-class gridengine::shadow_master {
-   require gridengine
+class gridengine::shadow_master($gridmaster = $grid_master) {
+   require gridengine($gridmaster)
 
 package { gridengine-master:
 ensure = latest,
diff --git a/modules/gridengine/manifests/submit_host.pp 
b/modules/gridengine/manifests/submit_host.pp
index af092d8..767d6f5 100644
--- a/modules/gridengine/manifests/submit_host.pp
+++ b/modules/gridengine/manifests/submit_host.pp
@@ -1,8 +1,8 @@
 # gridengine.pp
 
 
-class gridengine::submit_host {
-   require gridengine
+class gridengine::submit_host($gridmaster = $grid_master) {
+   require gridengine($gridmaster)
 
 package { gridengine-client:
 ensure = latest,
diff --git a/modules/gridengine/templates/gridengine.preseed.erb 
b/modules/gridengine/templates/gridengine.preseed.erb
index 1f57df1..e41e5fc 100644
--- a/modules/gridengine/templates/gridengine.preseed.erb
+++ b/modules/gridengine/templates/gridengine.preseed.erb
@@ -1,3 +1,3 @@
 gridengine-common shared/gridenginecell string default
 gridengine-common shared/gridengineconfig boolean true
-gridengine-common shared/gridenginemaster string %= grid_master %
+gridengine-common shared/gridenginemaster string %= gridmaster %

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I844113e7c073a30b3afd200d2970a0cb311e44ff
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: coren mpellet...@wikimedia.org
Gerrit-Reviewer: Andrew Bogott abog...@wikimedia.org
Gerrit-Reviewer: jenkins-bot

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