Dzahn has submitted this change and it was merged.
Change subject: ceilometer: move roles to modules/role/
......................................................................
ceilometer: move roles to modules/role/
Split the file into one file per class and move
it into proper autoload layout in the role module.
Change-Id: I3f985795d4e63268823e684f7821e68b2c2c9884
---
D manifests/role/ceilometer.pp
A modules/role/manifests/ceilometer/compute.pp
A modules/role/manifests/ceilometer/controller.pp
3 files changed, 19 insertions(+), 19 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/manifests/role/ceilometer.pp b/manifests/role/ceilometer.pp
deleted file mode 100644
index b60b59b..0000000
--- a/manifests/role/ceilometer.pp
+++ /dev/null
@@ -1,19 +0,0 @@
-class role::ceilometer::controller {
- include role::labs::openstack::nova::common
- $novaconfig = $role::labs::openstack::nova::common::novaconfig
-
- class { 'openstack::ceilometer::controller':
- openstack_version => $::openstack_version,
- novaconfig => $novaconfig,
- }
-}
-
-class role::ceilometer::compute {
- include role::labs::openstack::nova::common
- $novaconfig = $role::labs::openstack::nova::common::novaconfig
-
- class { 'openstack::ceilometer::compute':
- openstack_version => $::openstack_version,
- novaconfig => $novaconfig,
- }
-}
diff --git a/modules/role/manifests/ceilometer/compute.pp
b/modules/role/manifests/ceilometer/compute.pp
new file mode 100644
index 0000000..f87a6b7
--- /dev/null
+++ b/modules/role/manifests/ceilometer/compute.pp
@@ -0,0 +1,9 @@
+class role::ceilometer::compute {
+ include role::labs::openstack::nova::common
+ $novaconfig = $role::labs::openstack::nova::common::novaconfig
+
+ class { 'openstack::ceilometer::compute':
+ openstack_version => $::openstack_version,
+ novaconfig => $novaconfig,
+ }
+}
diff --git a/modules/role/manifests/ceilometer/controller.pp
b/modules/role/manifests/ceilometer/controller.pp
new file mode 100644
index 0000000..199cbc4
--- /dev/null
+++ b/modules/role/manifests/ceilometer/controller.pp
@@ -0,0 +1,10 @@
+class role::ceilometer::controller {
+ include role::labs::openstack::nova::common
+ $novaconfig = $role::labs::openstack::nova::common::novaconfig
+
+ class { 'openstack::ceilometer::controller':
+ openstack_version => $::openstack_version,
+ novaconfig => $novaconfig,
+ }
+}
+
--
To view, visit https://gerrit.wikimedia.org/r/260608
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3f985795d4e63268823e684f7821e68b2c2c9884
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Yuvipanda <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
