Change gnocchi storage and increase the capacity of ceph

1. Change the gnocchi storage to ceph.
2. Change the size of loopback to 500GB
3. Change the ceilometer polling yaml
4. Run ceilometer-upgrade command
   and restart ceilometer service

Change-Id: I8948c7b7e340c11e5d05c06a7d54c0e1b807620c
Signed-off-by: wutianwei <wutianwei1@huawei.com>

4 files changed, 57 insertions, 0 deletions

diff --git a/deploy/adapters/ansible/roles/post-osa/handlers/main.yml b/deploy/adapters/ansible/roles/post-osa/handlers/main.yml
index 3d979e6a..d685edca 100755
--- a/deploy/adapters/ansible/roles/post-osa/handlers/main.yml
+++ b/deploy/adapters/ansible/roles/post-osa/handlers/main.yml
@@ -9,3 +9,17 @@
 - name: restart network service
   shell: "/sbin/ifconfig eth0 0 &&/sbin/ifdown -a && \
           /sbin/ifup --ignore-errors -a"
+
+- name: Restart ceilometer services
+  service:
+    name: "{{ item.0.service_name }}"
+    enabled: "yes"
+    state: "restarted"
+  with_subelements:
+    - "{{ ceilometer_services }}"
+    - group
+  when: inventory_hostname in groups[item.1]
+  register: _restart
+  until: _restart | success
+  retries: 5
+  delay: 2
diff --git a/deploy/adapters/ansible/roles/post-osa/tasks/ceilometer-upgrade.yml b/deploy/adapters/ansible/roles/post-osa/tasks/ceilometer-upgrade.yml
new file mode 100755
index 00000000..3d991b74
--- /dev/null
+++ b/deploy/adapters/ansible/roles/post-osa/tasks/ceilometer-upgrade.yml
@@ -0,0 +1,28 @@
+#############################################################################
+# Copyright (c) 2017 HUAWEI TECHNOLOGIES CO.,LTD and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+---
+- name: check for gnocchi resource file
+  stat:
+    path: "/etc/ceilometer/gnocchi_resources.yaml"
+  register: gnocchi_resource_file
+
+- name: get the path of ceilometer-upgrade
+  shell: "find / -name ceilometer-upgrade 2>/dev/null || true"
+  register: ceilometer_upgrade_path
+
+- name: Initialize Gnocchi database by creating ceilometer resources
+  command: "{{ ceilometer_upgrade_path.stdout }} --skip-metering-database"
+  become: "yes"
+  when: gnocchi_resource_file.stat.exists
+  register: _upgrade
+  until: _upgrade | success
+  retries: 10
+  delay: 2
+  notify:
+    - Restart ceilometer services
diff --git a/deploy/adapters/ansible/roles/post-osa/tasks/main.yml b/deploy/adapters/ansible/roles/post-osa/tasks/main.yml
index bd83b50f..205f3392 100644
--- a/deploy/adapters/ansible/roles/post-osa/tasks/main.yml
+++ b/deploy/adapters/ansible/roles/post-osa/tasks/main.yml
@@ -23,3 +23,7 @@
   when:
     - ansible_os_family == 'RedHat' and ansible_distribution_major_version == '7'
     - inventory_hostname in groups['compute']
+
+- include: ceilometer-upgrade.yml
+  when:
+    - inventory_hostname in groups['ceilometer_all']
diff --git a/deploy/adapters/ansible/roles/post-osa/vars/main.yml b/deploy/adapters/ansible/roles/post-osa/vars/main.yml
index da886028..12728150 100644
--- a/deploy/adapters/ansible/roles/post-osa/vars/main.yml
+++ b/deploy/adapters/ansible/roles/post-osa/vars/main.yml
@@ -24,3 +24,14 @@ intf_storage: |-
   {%- set intf_storage = intf_storage + '.' + compu_sys_mappings["storage"]["vlan_tag"]|string %}
   {%- endif %}
   {{- intf_storage }}
+
+ceilometer_services:
+  ceilometer-agent-notification:
+    group:
+      - ceilometer_agent_notification
+    service_name: ceilometer-agent-notification
+  ceilometer-polling:
+    group:
+      - ceilometer_agent_central
+      - ceilometer_agent_compute
+    service_name: ceilometer-polling