[MediaWiki-commits] [Gerrit] openstack: catch nodepool up with manifest reorg - change (operations/puppet)

2015-11-25 Thread Rush (Code Review) 
Rush has submitted this change and it was merged.

Change subject: openstack: catch nodepool up with manifest reorg
..


openstack: catch nodepool up with manifest reorg

Change-Id: I75250bc36be660f6dfa49cca47971c1ecd6c19f5
---
R hieradata/role/eqiad/labs/openstack/nodepool.yaml
M manifests/site.pp
R modules/role/manifests/labs/openstack/nodepool.pp
3 files changed, 3 insertions(+), 2 deletions(-)

Approvals:
  Rush: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/hieradata/role/common/nodepool.yaml 
b/hieradata/role/eqiad/labs/openstack/nodepool.yaml
similarity index 100%
rename from hieradata/role/common/nodepool.yaml
rename to hieradata/role/eqiad/labs/openstack/nodepool.yaml
diff --git a/manifests/site.pp b/manifests/site.pp
index c003a8f..31714c3 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1204,7 +1204,7 @@
 
 node 'labnodepool1001.eqiad.wmnet' {
 $nagios_contact_group = 'admins,contint'
-role nodepool
+role labs::openstack::nodepool
 include standard
 include base::firewall
 }
diff --git a/manifests/role/nodepool.pp 
b/modules/role/manifests/labs/openstack/nodepool.pp
similarity index 97%
rename from manifests/role/nodepool.pp
rename to modules/role/manifests/labs/openstack/nodepool.pp
index a5f4e0e..2a03cc5 100644
--- a/manifests/role/nodepool.pp
+++ b/modules/role/manifests/labs/openstack/nodepool.pp
@@ -4,9 +4,10 @@
 # https://wikitech.wikimedia.org/wiki/Nodepool
 # http://docs.openstack.org/infra/nodepool/
 #
-class role::nodepool {
+class role::labs::openstack::nodepool {
 
 system::role { 'role::nodepool': description => 'CI Nodepool' }
+
 include passwords::nodepool
 $nova_controller = hiera('labs_nova_controller')
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I75250bc36be660f6dfa49cca47971c1ecd6c19f5
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Rush 
Gerrit-Reviewer: Rush 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] openstack: catch nodepool up with manifest reorg - change (operations/puppet)

2015-11-25 Thread Rush (Code Review) 
Rush has uploaded a new change for review.

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

Change subject: openstack: catch nodepool up with manifest reorg
..

openstack: catch nodepool up with manifest reorg

Change-Id: I75250bc36be660f6dfa49cca47971c1ecd6c19f5
---
M manifests/site.pp
R modules/role/manifests/labs/openstack/nodepool.pp
2 files changed, 3 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/92/255392/1

diff --git a/manifests/site.pp b/manifests/site.pp
index c003a8f..31714c3 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1204,7 +1204,7 @@
 
 node 'labnodepool1001.eqiad.wmnet' {
 $nagios_contact_group = 'admins,contint'
-role nodepool
+role labs::openstack::nodepool
 include standard
 include base::firewall
 }
diff --git a/manifests/role/nodepool.pp 
b/modules/role/manifests/labs/openstack/nodepool.pp
similarity index 97%
rename from manifests/role/nodepool.pp
rename to modules/role/manifests/labs/openstack/nodepool.pp
index a5f4e0e..2a03cc5 100644
--- a/manifests/role/nodepool.pp
+++ b/modules/role/manifests/labs/openstack/nodepool.pp
@@ -4,9 +4,10 @@
 # https://wikitech.wikimedia.org/wiki/Nodepool
 # http://docs.openstack.org/infra/nodepool/
 #
-class role::nodepool {
+class role::labs::openstack::nodepool {
 
 system::role { 'role::nodepool': description => 'CI Nodepool' }
+
 include passwords::nodepool
 $nova_controller = hiera('labs_nova_controller')
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I75250bc36be660f6dfa49cca47971c1ecd6c19f5
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Rush 

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