Add CentOS support for os_ceilometer role

Depends-On: Iaf51101bbaa5eba49f78e950152095913951430e
Change-Id: If002cf8f8f5c04df0dee664640ab725cea8c1a3b

handlers/main.yml

@@ -29,7 +29,7 @@
 
 - name: Restart Apache
   service:
-    name: "apache2"
+    name: "{{ ceilometer_system_service_name }}"
     state: "restarted"
   register: apache_restart
   until: apache_restart | success

releasenotes/notes/os_ceilometer-centos-support-2a87df89aa7b7556.yaml

@@ -0,0 +1,3 @@
+---
+features:
+  - CentOS7/RHEL support has been added to the os_ceilometer role.

tasks/ceilometer_apache.yml

@@ -18,37 +18,38 @@
     dest: "{{ item.dest }}"
     owner: "root"
     group: "root"
-  with_items:
-    - { src: "ceilometer-ports.conf.j2", dest: "/etc/apache2/ports.conf" }
-    - { src: "ceilometer-httpd.conf.j2", dest: "/etc/apache2/sites-available/ceilometer-httpd.conf" }
-  notify:
-    - Restart Apache
+  with_items: "{{ ceilometer_apache_config }}"
+  notify: Restart Apache
 
 - name: Disable default apache site
   file:
-    path: "/etc/apache2/sites-enabled/000-default.conf"
+    path: "{{ item }}"
     state: "absent"
+  with_items: "{{ ceilometer_apache_default_sites }}"
   notify:
     - Restart Apache
 
 - name: Enabled ceilometer vhost
   file:
-    src: "/etc/apache2/sites-available/ceilometer-httpd.conf"
-    dest: "/etc/apache2/sites-enabled/ceilometer-httpd.conf"
+    src: "{{ ceilometer_apache_site_available }}"
+    dest: "{{ ceilometer_apache_site_enabled }}"
     state: "link"
+  when:
+    - ceilometer_apache_site_available is defined
+    - ceilometer_apache_site_enabled is defined
   notify:
     - Restart Apache
 
 - name: Ensure Apache ServerName
   lineinfile:
-    dest: "/etc/apache2/apache2.conf"
+    dest: "{{ ceilometer_apache_conf }}"
     line: "ServerName {{ inventory_hostname }}"
   notify:
     - Restart Apache
 
 - name: Ensure Apache ServerTokens
   lineinfile:
-    dest: "/etc/apache2/conf-available/security.conf"
+    dest: "{{ ceilometer_apache_security_conf }}"
     regexp: '^ServerTokens'
     line: "ServerTokens {{ ceilometer_apache_servertokens }}"
   notify:
@@ -56,8 +57,24 @@
 
 - name: Ensure Apache ServerSignature
   lineinfile:
-    dest: "/etc/apache2/conf-available/security.conf"
+    dest: "{{ ceilometer_apache_security_conf }}"
     regexp: '^ServerSignature'
     line: "ServerSignature {{ ceilometer_apache_serversignature }}"
   notify:
     - Restart Apache
+
+- name: remove Listen from Apache config
+  lineinfile:
+    dest: "{{ ceilometer_apache_security_conf }}"
+    regexp: '^(Listen.*)'
+    backrefs: yes
+    line: '#\1'
+  notify:
+    - Restart Apache
+
+- name: Load service
+  service:
+    name: "{{ ceilometer_system_service_name }}"
+    enabled: "yes"
+    state: "started"
+

tests/test-install-mongodb.yml

@@ -17,31 +17,58 @@
   hosts: mongo_all
   user: root
 
+  roles:
+    - role: "pip_install"
+      tags:
+        - pip
+
   tasks:
     - name: Install mongo packages
-      apt:
+      package:
         state: present
         name: "{{ item }}"
       with_items: "{{ packages_mongodb }}"
 
+    - name: Install client package (Ubuntu)
+      package:
+        state: present
+        name: "{{ item }}"
+      with_items:
+        - mongodb-clients
+        - python-pymongo
+      when: ansible_pkg_mgr == 'apt'
+
+    - name: Install client package (CentOS)
+      package:
+        state: present
+        name: mongodb
+      when: ansible_pkg_mgr == 'yum'
+
+    - name: Install pip package (CentOS)
+      pip:
+        state: latest
+        name: pymongo
+      when: ansible_pkg_mgr == 'yum'
+
     - name: Configure the MongoDB bind address
       lineinfile:
-        dest: /etc/mongodb.conf
+        dest: "{{ mongodb_config_file }}"
         regexp: "^(#)?bind_ip"
         line: "bind_ip = {{ ansible_host }}"
       register: mongodb_bind
 
     - name: Enable the MongoDB smallfiles option
       lineinfile:
-        dest: /etc/mongodb.conf
+        dest: "{{ mongodb_config_file }}"
         regexp: "^(#)?smallfiles"
         line: "smallfiles = true"
       register: mongodb_smallfiles
 
     - name: Restart mongodb
       service:
-        name: mongodb
+        name: "{{ mongodb_service_name }}"
         state: restarted
+        enabled: yes
       when:
         - mongodb_bind | changed or mongodb_smallfiles | changed
       register: mongodb_restart
@@ -82,8 +109,8 @@
         state: present
   vars:
     packages_mongodb:
-      - mongodb-clients
       - mongodb-server
-      - python-pymongo
+    mongodb_config_file: "{{ (ansible_pkg_mgr == 'apt') | ternary('/etc/mongodb.conf','/etc/mongod.conf') }}"
+    mongodb_service_name: "{{ (ansible_pkg_mgr == 'apt') | ternary('mongodb','mongod') }}"
     ceilometer_database_name: ceilometer
-    ceilometer_database_user: ceilometer
+    ceilometer_database_user: ceilometer

vars/redhat-7.yml

@@ -0,0 +1,45 @@
+---
+# Copyright 2014, Rackspace US, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+ceilometer_distro_packages:
+  - git
+  - rpcbind
+  - rsync
+
+# Packages required in developer mode, where packages are built locally
+ceilometer_developer_mode_distro_packages:
+  - libvirt-devel
+  - libxml2-devel
+  - libxslt-devel
+
+ceilometer_apache_distro_packages:
+  - httpd
+  - httpd-tools
+  - mod_wsgi
+
+ceilometer_system_service_name: httpd
+ceilometer_apache_conf: "/etc/httpd/conf/httpd.conf"
+ceilometer_apache_security_conf: "{{ ceilometer_apache_conf }}"
+
+ceilometer_apache_default_sites:
+  - "/etc/httpd/conf.d/userdir.conf"
+  - "/etc/httpd/conf.d/welcome.conf"
+  - "/etc/httpd/conf.d/ssl.conf"
+
+ceilometer_apache_config:
+  - { src: "ceilometer-ports.conf.j2", dest: "/etc/httpd/conf.d/ports.conf"  }
+  - { src: "ceilometer-httpd.conf.j2", dest: "/etc/httpd/conf.d/ceilometer-httpd.conf" }
+
+

vars/ubuntu-16.04.yml

@@ -33,3 +33,18 @@ ceilometer_apache_distro_packages:
   - apache2
   - apache2-utils
   - libapache2-mod-wsgi
+
+ceilometer_system_service_name: apache2
+ceilometer_apache_conf: "/etc/apache2/apache2.conf"
+ceilometer_apache_security_conf: "/etc/apache2/conf-available/security.conf"
+
+ceilometer_apache_site_available: "/etc/apache2/sites-available/ceilometer-httpd.conf"
+ceilometer_apache_site_enabled: "/etc/apache2/sites-enabled/ceilometer-httpd.conf"
+
+ceilometer_apache_default_sites:
+  - "/etc/apache2/sites-enabled/000-default.conf"
+
+ceilometer_apache_config:
+  - { src: "ceilometer-ports.conf.j2", dest: "/etc/apache2/ports.conf" }
+  - { src: "ceilometer-httpd.conf.j2", dest: "/etc/apache2/sites-available/ceilometer-httpd.conf" }
+