Enable Gnocchi by default

Ceilometer is set to use Gnocchi dispatch when Gnocchi is deployed.
All references to MongoDB in the AIO are removed.

Partial-Blueprint: role-gnocchi
Depends-On: I94e7d461376a8032a76ea34b57190077a60a0fb5
Change-Id: Ia41141e947d48426c7d490497639d62e8dff6f8e

etc/openstack_deploy/user_secrets.yml

@@ -68,7 +68,7 @@ glance_profiler_hmac_key:
 glance_rabbitmq_password:
 
 ## Gnocchi Options:
-gnocchi_galera_password:
+gnocchi_container_mysql_password:
 gnocchi_service_password:
 
 ## Heat Options

etc/openstack_deploy/user_variables.yml

@@ -21,11 +21,6 @@
 ## Debug and Verbose options.
 debug: false
 
-## Common Ceilometer Overrides
-# ceilometer_db_type: mongodb
-# ceilometer_db_ip: localhost
-# ceilometer_db_port: 27017
-
 ## Common Glance Overrides
 # Set glance_default_store to "swift" if using Cloud Files or swift backend
 # or "rbd" if using ceph backend; the latter will trigger ceph to get

playbooks/inventory/group_vars/ceilometer_all.yml

@@ -18,4 +18,5 @@ ceilometer_service_adminurl: "{{ ceilometer_service_adminuri }}/"
 ceilometer_service_region: "{{ service_region }}"
 ceilometer_service_in_ldap: "{{ service_ldap_backend_enabled }}"
 
-ceilometer_aodh_enabled: groups['aodh_all'] is defined and groups['aodh_all'] | length > 0
+ceilometer_aodh_enabled: groups['aodh_all'] is defined and groups['aodh_all'] | length > 0
+ceilometer_gnocchi_enabled: groups['gnocchi_all'] is defined and groups['gnocchi_all'] | length > 0

tests/roles/bootstrap-host/defaults/main.yml

@@ -79,21 +79,6 @@ bootstrap_host_data_disk_device_force: no
 # size (in GB), the bootstrap process will use it.
 bootstrap_host_data_disk_min_size: 60
 
-### MongoDB Settings
-# MongoDB is installed on the host in the AIO for Ceilometer and Aodh to use.
-#
-# Boolean value to deploy and configure the MongoDB service on the host.
-bootstrap_host_mongodb_service: yes
-#
-# Boolean value to configure the required MongoDB users
-bootstrap_host_mongodb_users: "{{ bootstrap_host_mongodb_service }}"
-#
-# Specify the IP address of a MongoDB Host.
-bootstrap_host_mongodb_address: 172.29.236.100
-#
-# Specify the password to be used with the first mongo admin user
-bootstrap_host_mongodb_password: SuperSecrete
-
 ### Optional Settings ###
 
 # Set the apt repository URL's configured for the host and containers.

tests/roles/bootstrap-host/tasks/install-apt.yml

@@ -83,12 +83,3 @@
   with_items: "{{ packages_install }}"
   tags:
     - install-packages
-
-- name: Install MongoDB packages
-  apt:
-    name: "{{ item }}"
-    state: present
-  with_items: "{{ packages_mongodb }}"
-  when: bootstrap_host_mongodb_service | bool
-  tags:
-    - install-mongodb

tests/roles/bootstrap-host/tasks/main.yml

@@ -99,15 +99,3 @@
   when: bootstrap_host_aio_config | bool
   tags:
     - prepare-aio-config
-
-# Prepare the MongoDB Service for Ceilometer/Aodh
-- include: prepare_mongodb_service.yml
-  when: bootstrap_host_mongodb_service | bool
-  tags:
-    - prepare-mongodb-service
-
-# Prepare the MongoDB Users for Ceilometer/Aodh
-- include: prepare_mongodb_users.yml
-  when: bootstrap_host_mongodb_users | bool
-  tags:
-    - prepare-mongodb-users

tests/roles/bootstrap-host/tasks/prepare_aio_config.yml

@@ -38,6 +38,8 @@
       override: "{{ aodh_conf_overrides | default({}) }}"
     - name: ceilometer.yml.aio
       override: "{{ ceilometer_conf_overrides | default({}) }}"
+    - name: gnocchi.yml.aio
+      override: "{{ gnocchi_conf_overrides | default({}) }}"
   tags:
     - deploy-confd
 

tests/roles/bootstrap-host/tasks/prepare_mongodb_service.yml

@@ -1,61 +0,0 @@
----
-# Copyright 2015, 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.
-
-- name: Configure the MongoDB bind address
-  lineinfile:
-    dest: /etc/mongodb.conf
-    regexp: "^(#)?bind_ip"
-    line: "bind_ip = {{ bootstrap_host_mongodb_address }}"
-  register: mongodb_bind
-  tags:
-    - mongodb-conf-bind_ip
-
-- name: Enable the MongoDB smallfiles option
-  lineinfile:
-    dest: /etc/mongodb.conf
-    regexp: "^(#)?smallfiles"
-    line: "smallfiles = true"
-  register: mongodb_smallfiles
-  tags:
-    - mongodb-conf-smallfiles
-
-- name: Restart mongodb
-  service:
-    name: mongodb
-    state: restarted
-  when:
-    - mongodb_bind | changed or mongodb_smallfiles | changed
-  register: mongodb_restart
-  tags:
-    - mongodb-restart
-
-- name: Wait for mongodb to come back online after the restart
-  wait_for:
-    host: "{{ bootstrap_host_mongodb_address }}"
-    port: 27017
-    delay: 5
-    timeout: 30
-  when:
-    - mongodb_restart is defined
-    - mongodb_restart | changed
-  tags:
-    - mongodb-wait
-
-- name: Test mongodb connectivity
-  command: "mongo --host {{ bootstrap_host_mongodb_address }} --eval ' '"
-  changed_when: False
-  tags:
-    - mongodb-test
-

tests/roles/bootstrap-host/tasks/prepare_mongodb_users.yml

@@ -1,56 +0,0 @@
----
-# Copyright 2015, 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.
-
-- name: Read user_secrets vars
-  include_vars: /etc/openstack_deploy/user_secrets.yml
-  tags:
-    - mongodb-secrets
-
-- name: Add admin user
-  mongodb_user:
-    login_host: "{{ bootstrap_host_mongodb_address }}"
-    database: admin
-    name: root
-    password: "{{ bootstrap_host_mongodb_password }}"
-    roles: 'root'
-    state: present
-  tags:
-    - mongodb-create-user-admin
-
-- name: Add ceilometer database user
-  mongodb_user:
-    login_host: "{{ bootstrap_host_mongodb_address }}"
-    login_user: "root"
-    login_password: "{{ bootstrap_host_mongodb_password }}"
-    database: ceilometer
-    name: ceilometer
-    password: "{{ ceilometer_container_db_password }}"
-    roles: 'readWrite,dbAdmin'
-    state: present
-  tags:
-    - mongodb-create-user-ceilometer
-
-- name: Add aodh database user
-  mongodb_user:
-    login_host: "{{ bootstrap_host_mongodb_address }}"
-    login_user: "root"
-    login_password: "{{ bootstrap_host_mongodb_password }}"
-    database: aodh
-    name: aodh
-    password: "{{ aodh_container_db_password }}"
-    roles: 'readWrite,dbAdmin'
-    state: present
-  tags:
-    - mongodb-create-user-aodh

tests/roles/bootstrap-host/templates/user_variables.aio.yml.j2

@@ -16,16 +16,6 @@
 ## General options
 debug: True
 
-## Ceilometer Options
-ceilometer_db_type: mongodb
-ceilometer_db_ip: {{ bootstrap_host_mongodb_address }}
-ceilometer_db_port: 27017
-
-## Aodh Options
-aodh_db_type: mongodb
-aodh_db_ip: {{ bootstrap_host_mongodb_address }}
-aodh_db_port: 27017
-
 ## Glance Options
 glance_default_store: swift
 

tests/roles/bootstrap-host/vars/ubuntu.yml

@@ -32,8 +32,3 @@ packages_install:
 packages_remove:
   - libmysqlclient18
   - mysql-common
-
-packages_mongodb:
-  - mongodb-clients
-  - mongodb-server
-  - python-pymongo