From 97bc7bc21e971659fc283e21de5fe4ae15b75f81 Mon Sep 17 00:00:00 2001
From: akrzos <akrzos@redhat.com>
Date: Mon, 9 Jan 2017 12:48:31 -0500
Subject: [PATCH] Small fixes/updates to collectd install

+ Fix installing collectd on cephstorage host type
+ Remove old collectd configuration documentation
+ Have check playbook run against cephstorage hosts (previously it was just ceph)

Change-Id: Ic53351da1a6fd9951984301ec16ba75fdd0fe1c7
---
 ansible/README.cfme-allinone.rst              |  6 -----
 ansible/README.collectd-generic.rst           | 22 ++++++++-----------
 ansible/check/site.yml                        |  2 +-
 ansible/install/elk-openstack-client.yml      |  2 +-
 ...d.conf.j2 => cephstorage.collectd.conf.j2} |  0
 5 files changed, 11 insertions(+), 21 deletions(-)
 delete mode 100644 ansible/README.cfme-allinone.rst
 rename ansible/install/roles/collectd-openstack/templates/{ceph.collectd.conf.j2 => cephstorage.collectd.conf.j2} (100%)

diff --git a/ansible/README.cfme-allinone.rst b/ansible/README.cfme-allinone.rst
deleted file mode 100644
index 5d7aa7523..000000000
--- a/ansible/README.cfme-allinone.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-Setting up a CFME or ManageIQ VM for All-In-One Performance Monitoring
-======================================================================
-
-This has been moved to its own repo:
-
-https://github.com/akrzos/cfme-performance
diff --git a/ansible/README.collectd-generic.rst b/ansible/README.collectd-generic.rst
index 69b82a855..b8e5cb2cb 100644
--- a/ansible/README.collectd-generic.rst
+++ b/ansible/README.collectd-generic.rst
@@ -5,8 +5,6 @@ Collectd configurations are built for these types of machines:
   * baremetal
   * guest
   * graphite/grafana
-  * ose
-  * satellite6
 
 To install collectd agent and configure collectd to send metrics to your
 Graphite server, simply add the host to your ansible inventory file
@@ -28,9 +26,12 @@ Complete Example Inventory file:
     overcloud-compute-0
     overcloud-compute-1
 
-    [ceph]
+    [cephstorage]
     overcloud-cephstorage-0
 
+    [objectstorage]
+    overcloud-objectstorage-0
+
     [baremetal]
     x.x.x.x # An ip adddress or fqdn or specificed host in ~/.ssh/config
 
@@ -40,20 +41,15 @@ Complete Example Inventory file:
     [graphite]
     x.x.x.x # An ip address of a Graphite/Grafana Server
 
-    [ose]
-    x.x.x.x # An ip address of a Red Hat Openshift Enterprise Node
-
-    [satellite6]
-    x.x.x.x # An ip address of a Red Hat Satellite 6 Server
 
 Example running the collectd-generic playbook on the above specified
-satellite6 machine:
+baremetal machine:
 
 ::
 
-    # ansible-playbook -i hosts install/collectd-generic.yml --tags "satellite6"
+    # ansible-playbook -i hosts install/collectd-generic.yml --tags "baremetal"
 
-Replace "satellite6" with whatever machines you intend to install collectd on.
+Replace "baremetal" with whatever machines you intend to install collectd on.
 
-Note: Openstack host groups (undercloud, controller, compute, ceph) are
-ignored with the collectd-generic.yml playbook.
+Note: Openstack host groups (undercloud, controller, compute, cephstorage,
+objectstorage) are ignored with the collectd-generic.yml playbook.
diff --git a/ansible/check/site.yml b/ansible/check/site.yml
index 887d137d1..62a6508fa 100644
--- a/ansible/check/site.yml
+++ b/ansible/check/site.yml
@@ -43,7 +43,7 @@
   - compute
   - nova
 
-- hosts: ceph
+- hosts: cephstorage
   name: Checking Ceph Hosts for common Performance Issues
   remote_user: heat-admin
   roles:
diff --git a/ansible/install/elk-openstack-client.yml b/ansible/install/elk-openstack-client.yml
index d20117e55..7e140fb50 100644
--- a/ansible/install/elk-openstack-client.yml
+++ b/ansible/install/elk-openstack-client.yml
@@ -7,7 +7,7 @@
   roles:
      - { role: filebeat }
 
-- hosts: controller,compute,ceph
+- hosts: controller,compute,cephstorage
   remote_user: "{{ host_remote_user }}"
   roles:
     - { role: filebeat }
diff --git a/ansible/install/roles/collectd-openstack/templates/ceph.collectd.conf.j2 b/ansible/install/roles/collectd-openstack/templates/cephstorage.collectd.conf.j2
similarity index 100%
rename from ansible/install/roles/collectd-openstack/templates/ceph.collectd.conf.j2
rename to ansible/install/roles/collectd-openstack/templates/cephstorage.collectd.conf.j2