Rush has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/383946 )
Change subject: openstack: cleanup ceilometer files and roles
......................................................................
openstack: cleanup ceilometer files and roles
Not currently being used or managed
Bug: T171494
Change-Id: Iaf22f5ce60755a9c0759ca0c15ba757cfdc89fa5
---
M hieradata/common.yaml
M hieradata/regex.yaml
D modules/openstack/manifests/ceilometer/compute.pp
D modules/openstack/manifests/ceilometer/controller.pp
D modules/role/manifests/ceilometer/compute.pp
D modules/role/manifests/ceilometer/controller.pp
6 files changed, 0 insertions(+), 77 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/46/383946/1
diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 6ab8b06..1bfe69c 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -379,7 +379,6 @@
db_name: 'nova'
api_db_name: 'novaapi'
db_user: 'nova'
- ceilometer_db_name: 'ceilometer'
ldap_base_dn: 'dc=wikimedia,dc=org'
ldap_user_dn: 'uid=novaadmin,ou=people,dc=wikimedia,dc=org'
ldap_proxyagent: 'cn=proxyagent,ou=profile,dc=wikimedia,dc=org'
diff --git a/hieradata/regex.yaml b/hieradata/regex.yaml
index 1a5a3b3..8f22550 100644
--- a/hieradata/regex.yaml
+++ b/hieradata/regex.yaml
@@ -233,7 +233,6 @@
api_host: *labsnovaapihost
db_name: 'nova'
db_user: 'nova'
- ceilometer_db_name: 'ceilometer'
ldap_base_dn: 'dc=wikimedia,dc=org'
ldap_user_dn: 'uid=novaadmin,ou=people,dc=wikimedia,dc=org'
ldap_proxyagent: 'cn=proxyagent,ou=profile,dc=wikimedia,dc=org'
diff --git a/modules/openstack/manifests/ceilometer/compute.pp
b/modules/openstack/manifests/ceilometer/compute.pp
deleted file mode 100644
index 20ecfdb..0000000
--- a/modules/openstack/manifests/ceilometer/compute.pp
+++ /dev/null
@@ -1,23 +0,0 @@
-# Telemetry for OpenStack - the agent
-# https://wiki.openstack.org/wiki/Ceilometer
-class openstack::ceilometer::compute ($novaconfig,
$openstack_version=$::openstack::version) {
-
- package { [ceilometer-agent-compute]:
- ensure => present,
- }
-
- service {'ceilometer-agent-compute':
- ensure => running,
- require => Package['ceilometer-agent-compute'];
- }
-
- file {
- '/etc/ceilometer/ceilometer.conf':
- content =>
template("openstack/${openstack_version}/ceilometer/ceilometer.conf.erb"),
- owner => 'ceilometer',
- group => 'ceilometer',
- notify => Service['ceilometer-agent-compute'],
- require => Package['ceilometer-agent-compute'],
- mode => '0440';
- }
-}
diff --git a/modules/openstack/manifests/ceilometer/controller.pp
b/modules/openstack/manifests/ceilometer/controller.pp
deleted file mode 100644
index de68201..0000000
--- a/modules/openstack/manifests/ceilometer/controller.pp
+++ /dev/null
@@ -1,33 +0,0 @@
-# Telemetry for OpenStack - the controller
-# https://wiki.openstack.org/wiki/Ceilometer
-class openstack::ceilometer::controller ($novaconfig,
$openstack_version=$::openstack::version) {
-
- package { [ceilometer-api, ceilometer-collector, ceilometer-agent-central,
python-ceilometerclient]:
- ensure => present,
- }
-
- service {'ceilometer-api':
- ensure => running,
- require => Package['ceilometer-api'];
- }
-
- service {'ceilometer-collector':
- ensure => running,
- require => Package['ceilometer-collector'];
- }
-
- service {'ceilometer-agent-central':
- ensure => running,
- require => Package['ceilometer-agent-central'];
- }
-
- file {
- '/etc/ceilometer/ceilometer.conf':
- content =>
template("openstack/${openstack_version}/ceilometer/ceilometer.conf.erb"),
- owner => 'ceilometer',
- group => 'ceilometer',
- notify =>
Service['ceilometer-api','ceilometer-collector','ceilometer-agent-central'],
- require => Package['ceilometer-api'],
- mode => '0440';
- }
-}
diff --git a/modules/role/manifests/ceilometer/compute.pp
b/modules/role/manifests/ceilometer/compute.pp
deleted file mode 100644
index f87a6b7..0000000
--- a/modules/role/manifests/ceilometer/compute.pp
+++ /dev/null
@@ -1,9 +0,0 @@
-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
deleted file mode 100644
index 199cbc4..0000000
--- a/modules/role/manifests/ceilometer/controller.pp
+++ /dev/null
@@ -1,10 +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,
- }
-}
-
--
To view, visit https://gerrit.wikimedia.org/r/383946
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaf22f5ce60755a9c0759ca0c15ba757cfdc89fa5
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Rush <r...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
