Rush has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/384585 )
Change subject: openstack: ensure system::role on all role/wmcs
......................................................................
openstack: ensure system::role on all role/wmcs
Bug: T171494
Change-Id: Ibea4fb01fad5fa2e35e7a2d18a53ecbaefca73e0
---
M modules/role/manifests/wmcs/openstack/labtest/control.pp
M modules/role/manifests/wmcs/openstack/labtest/net.pp
M modules/role/manifests/wmcs/openstack/labtest/virt.pp
M modules/role/manifests/wmcs/openstack/labtestn/control.pp
M modules/role/manifests/wmcs/openstack/labtestn/net.pp
M modules/role/manifests/wmcs/openstack/labtestn/virt.pp
M modules/role/manifests/wmcs/openstack/labtestn/web.pp
M modules/role/manifests/wmcs/openstack/main/control.pp
M modules/role/manifests/wmcs/openstack/main/horizon.pp
M modules/role/manifests/wmcs/openstack/main/net.pp
M modules/role/manifests/wmcs/openstack/main/net_standby.pp
M modules/role/manifests/wmcs/openstack/main/nodepool.pp
M modules/role/manifests/wmcs/openstack/main/virt.pp
13 files changed, 15 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/85/384585/1
diff --git a/modules/role/manifests/wmcs/openstack/labtest/control.pp
b/modules/role/manifests/wmcs/openstack/labtest/control.pp
index 9da1977..8e23130 100644
--- a/modules/role/manifests/wmcs/openstack/labtest/control.pp
+++ b/modules/role/manifests/wmcs/openstack/labtest/control.pp
@@ -1,4 +1,5 @@
class role::wmcs::openstack::labtest::control {
+ system::role { $name: }
include ::profile::openstack::labtest::observerenv
include ::profile::openstack::labtest::rabbitmq
include ::profile::openstack::labtest::keystone::service
diff --git a/modules/role/manifests/wmcs/openstack/labtest/net.pp
b/modules/role/manifests/wmcs/openstack/labtest/net.pp
index 9367e8b..d0e98dd 100644
--- a/modules/role/manifests/wmcs/openstack/labtest/net.pp
+++ b/modules/role/manifests/wmcs/openstack/labtest/net.pp
@@ -1,4 +1,5 @@
class role::wmcs::openstack::labtest::net {
+ system::role { $name: }
include ::profile::openstack::labtest::cloudrepo
include ::profile::openstack::labtest::nova::common
include ::profile::openstack::labtest::nova::network::service
diff --git a/modules/role/manifests/wmcs/openstack/labtest/virt.pp
b/modules/role/manifests/wmcs/openstack/labtest/virt.pp
index 8b656b5..f85e6bd 100644
--- a/modules/role/manifests/wmcs/openstack/labtest/virt.pp
+++ b/modules/role/manifests/wmcs/openstack/labtest/virt.pp
@@ -1,5 +1,6 @@
class role::wmcs::openstack::labtest::virt {
- include profile::openstack::labtest::cloudrepo
+ system::role { $name: }
+ include ::profile::openstack::labtest::cloudrepo
include ::profile::openstack::labtest::nova::common
include ::profile::openstack::labtest::nova::compute::service
}
diff --git a/modules/role/manifests/wmcs/openstack/labtestn/control.pp
b/modules/role/manifests/wmcs/openstack/labtestn/control.pp
index f4821ff..32b444f 100644
--- a/modules/role/manifests/wmcs/openstack/labtestn/control.pp
+++ b/modules/role/manifests/wmcs/openstack/labtestn/control.pp
@@ -1,4 +1,5 @@
class role::wmcs::openstack::labtestn::control {
+ system::role { $name: }
include ::profile::openstack::labtestn::observerenv
include ::profile::openstack::labtestn::rabbitmq
include ::profile::openstack::labtestn::keystone::service
diff --git a/modules/role/manifests/wmcs/openstack/labtestn/net.pp
b/modules/role/manifests/wmcs/openstack/labtestn/net.pp
index 91bc656..948e3c0 100644
--- a/modules/role/manifests/wmcs/openstack/labtestn/net.pp
+++ b/modules/role/manifests/wmcs/openstack/labtestn/net.pp
@@ -1,4 +1,5 @@
class role::wmcs::openstack::labtestn::net {
+ system::role { $name: }
include ::profile::openstack::labtestn::cloudrepo
include ::profile::openstack::labtestn::nova::common
}
diff --git a/modules/role/manifests/wmcs/openstack/labtestn/virt.pp
b/modules/role/manifests/wmcs/openstack/labtestn/virt.pp
index 980a02b..5c59e23 100644
--- a/modules/role/manifests/wmcs/openstack/labtestn/virt.pp
+++ b/modules/role/manifests/wmcs/openstack/labtestn/virt.pp
@@ -1,4 +1,5 @@
class role::wmcs::openstack::labtestn::virt {
+ system::role { $name: }
include ::profile::openstack::labtestn::cloudrepo
include ::profile::openstack::labtestn::nova::common
include ::profile::openstack::labtestn::nova::compute::service
diff --git a/modules/role/manifests/wmcs/openstack/labtestn/web.pp
b/modules/role/manifests/wmcs/openstack/labtestn/web.pp
index 439cc40..69683d5 100644
--- a/modules/role/manifests/wmcs/openstack/labtestn/web.pp
+++ b/modules/role/manifests/wmcs/openstack/labtestn/web.pp
@@ -1,4 +1,5 @@
class role::wmcs::openstack::labtestn::web {
+ system::role { $name: }
include ::profile::openstack::labtestn::cloudrepo
include ::profile::openstack::labtestn::clientlib
include ::profile::openstack::labtestn::observerenv
diff --git a/modules/role/manifests/wmcs/openstack/main/control.pp
b/modules/role/manifests/wmcs/openstack/main/control.pp
index 50d64cb..f65d901 100644
--- a/modules/role/manifests/wmcs/openstack/main/control.pp
+++ b/modules/role/manifests/wmcs/openstack/main/control.pp
@@ -1,4 +1,5 @@
class role::wmcs::openstack::main::control {
+ system::role { $name: }
include ::profile::openstack::main::observerenv
include ::profile::openstack::main::rabbitmq
include ::profile::openstack::main::keystone::service
diff --git a/modules/role/manifests/wmcs/openstack/main/horizon.pp
b/modules/role/manifests/wmcs/openstack/main/horizon.pp
index d05e6d2..9f1587b 100644
--- a/modules/role/manifests/wmcs/openstack/main/horizon.pp
+++ b/modules/role/manifests/wmcs/openstack/main/horizon.pp
@@ -1,6 +1,7 @@
# All horizon/striker/wikitech profiles should fold into
# role::wmcs::openstack::main::web when labweb* is finished
class role::wmcs::openstack::main::horizon {
+ system::role { $name: }
include ::profile::openstack::main::cloudrepo
include ::profile::openstack::main::observerenv
include ::profile::openstack::main::horizon::dashboard
diff --git a/modules/role/manifests/wmcs/openstack/main/net.pp
b/modules/role/manifests/wmcs/openstack/main/net.pp
index b3b9c4a..7441ab6 100644
--- a/modules/role/manifests/wmcs/openstack/main/net.pp
+++ b/modules/role/manifests/wmcs/openstack/main/net.pp
@@ -1,4 +1,5 @@
class role::wmcs::openstack::main::net {
+ system::role { $name: }
include ::profile::openstack::main::cloudrepo
include ::profile::openstack::main::clientlib
include ::profile::openstack::main::observerenv
diff --git a/modules/role/manifests/wmcs/openstack/main/net_standby.pp
b/modules/role/manifests/wmcs/openstack/main/net_standby.pp
index d10873e..9eccd60 100644
--- a/modules/role/manifests/wmcs/openstack/main/net_standby.pp
+++ b/modules/role/manifests/wmcs/openstack/main/net_standby.pp
@@ -1,4 +1,5 @@
class role::wmcs::openstack::main::net_standby {
+ system::role { $name: }
include ::profile::openstack::main::cloudrepo
include ::profile::openstack::main::clientlib
include ::profile::openstack::main::observerenv
diff --git a/modules/role/manifests/wmcs/openstack/main/nodepool.pp
b/modules/role/manifests/wmcs/openstack/main/nodepool.pp
index a0fc2dd..7e77871 100644
--- a/modules/role/manifests/wmcs/openstack/main/nodepool.pp
+++ b/modules/role/manifests/wmcs/openstack/main/nodepool.pp
@@ -1,3 +1,4 @@
class role::wmcs::openstack::main::nodepool {
+ system::role { $name: }
include ::profile::openstack::main::nodepool::service
}
diff --git a/modules/role/manifests/wmcs/openstack/main/virt.pp
b/modules/role/manifests/wmcs/openstack/main/virt.pp
index d27362b..9e2ba76 100644
--- a/modules/role/manifests/wmcs/openstack/main/virt.pp
+++ b/modules/role/manifests/wmcs/openstack/main/virt.pp
@@ -1,5 +1,6 @@
class role::wmcs::openstack::main::virt {
- include profile::openstack::main::cloudrepo
+ system::role { $name: }
+ include ::profile::openstack::main::cloudrepo
include ::profile::openstack::main::nova::common
include ::profile::openstack::main::nova::compute::service
}
--
To view, visit https://gerrit.wikimedia.org/r/384585
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibea4fb01fad5fa2e35e7a2d18a53ecbaefca73e0
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Rush <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
