Remove Ansible from Kolla

Change-Id: I5396e4b9927d3e65b6aa4185238a43a4765a996b

23 files changed, 0 insertions, 1304 deletions

diff --git a/ansible/roles/ceilometer/defaults/main.yml b/ansible/roles/ceilometer/defaults/main.yml
deleted file mode 100644
index 60205fe3e..000000000
--- a/ansible/roles/ceilometer/defaults/main.yml
+++ /dev/null
@@ -1,51 +0,0 @@
----
-project_name: "ceilometer"
-
-
-####################
-# Database
-####################
-ceilometer_database_name: "ceilometer"
-ceilometer_database_user: "ceilometer"
-ceilometer_database_port: "{{ mongodb_port if ceilometer_database_type == 'mongodb' else database_port }}"
-
-ceilometer_database_mongodb_address: "{% for host in groups['mongodb'] %}{{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ ceilometer_database_port }}{% if not loop.last %},{% endif %}{% endfor %}"
-ceilometer_database_mysql_address: "{{ kolla_internal_fqdn }}"
-
-
-####################
-# Docker
-####################
-ceilometer_notification_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-ceilometer-notification"
-ceilometer_notification_tag: "{{ openstack_release }}"
-ceilometer_notification_image_full: "{{ ceilometer_notification_image }}:{{ ceilometer_notification_tag }}"
-
-ceilometer_api_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-ceilometer-api"
-ceilometer_api_tag: "{{ openstack_release }}"
-ceilometer_api_image_full: "{{ ceilometer_api_image }}:{{ ceilometer_api_tag }}"
-
-ceilometer_central_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-ceilometer-central"
-ceilometer_central_tag: "{{ openstack_release }}"
-ceilometer_central_image_full: "{{ ceilometer_central_image }}:{{ ceilometer_central_tag }}"
-
-ceilometer_collector_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-ceilometer-collector"
-ceilometer_collector_tag: "{{ openstack_release }}"
-ceilometer_collector_image_full: "{{ ceilometer_collector_image }}:{{ ceilometer_collector_tag }}"
-
-ceilometer_compute_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-ceilometer-compute"
-ceilometer_compute_tag: "{{ openstack_release }}"
-ceilometer_compute_image_full: "{{ ceilometer_compute_image }}:{{ ceilometer_compute_tag }}"
-
-
-####################
-# OpenStack
-####################
-ceilometer_admin_endpoint: "{{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ ceilometer_api_port }}"
-ceilometer_internal_endpoint: "{{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ ceilometer_api_port }}"
-ceilometer_public_endpoint: "{{ public_protocol }}://{{ kolla_external_fqdn }}:{{ ceilometer_api_port }}"
-
-ceilometer_logging_debug: "{{ openstack_logging_debug }}"
-
-ceilometer_keystone_user: "ceilometer"
-
-openstack_ceilometer_auth: "{'auth_url':'{{ openstack_auth.auth_url }}','username':'{{ openstack_auth.username }}','password':'{{ openstack_auth.password }}','project_name':'{{ openstack_auth.project_name }}','domain_name':'default'}"
diff --git a/ansible/roles/ceilometer/meta/main.yml b/ansible/roles/ceilometer/meta/main.yml
deleted file mode 100644
index 6b4fff8fe..000000000
--- a/ansible/roles/ceilometer/meta/main.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-dependencies:
-  - { role: common }
diff --git a/ansible/roles/ceilometer/tasks/bootstrap.yml b/ansible/roles/ceilometer/tasks/bootstrap.yml
deleted file mode 100644
index 7078709ed..000000000
--- a/ansible/roles/ceilometer/tasks/bootstrap.yml
+++ /dev/null
@@ -1,73 +0,0 @@
----
-- name: Creating Ceilometer MongoDB database
-  command: docker exec -t mongodb mongo --host {{ ceilometer_database_mongodb_address }} --eval 'db = db.getSiblingDB("{{ ceilometer_database_name }}"); db.createUser({user':' "{{ ceilometer_database_user }}", pwd':' "{{ ceilometer_database_password}}", roles':' [ "readWrite", "dbAdmin" ]})'
-  register: mongodb_ceilometer_database
-  run_once: true
-  failed_when:
-    - "'already' not in mongodb_ceilometer_database.stdout"
-    - mongodb_ceilometer_database.stdout.split()[4] != 'connecting'
-  delegate_to: "{{ groups['mongodb'][0] }}"
-  when:
-    - ceilometer_database_type == "mongodb"
-
-- name: Checking Ceilometer mysql database
-  command: docker exec -t kolla_toolbox /usr/bin/ansible localhost
-    -m mysql_db
-    -a "login_host='{{ ceilometer_database_mysql_address }}'
-        login_port='{{ ceilometer_database_port }}'
-        login_user='{{ ceilometer_database_user }}'
-        login_password='{{ ceilometer_database_password }}'
-        name='{{ ceilometer_database_name }}'"
-  register: mysql_access
-  failed_when: False
-  changed_when: False
-  run_once: True
-  when:
-    - ceilometer_database_type == "mysql"
-
-- name: Creating Ceilometer mysql database
-  command: docker exec -t kolla_toolbox /usr/bin/ansible localhost
-    -m mysql_db
-    -a "login_host='{{ ceilometer_database_mysql_address }}'
-        login_port='{{ ceilometer_database_port }}'
-        login_user='{{ database_user }}'
-        login_password='{{ database_password }}'
-        name='{{ ceilometer_database_name }}'"
-  register: mysql_ceilometer_database
-  changed_when: "{{ mysql_ceilometer_database.stdout.find('localhost | SUCCESS => ') != -1 and
-                    (mysql_ceilometer_database.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed }}"
-  failed_when: mysql_ceilometer_database.stdout.split()[2] != 'SUCCESS'
-  run_once: True
-  delegate_to: "{{ groups['ceilometer-api'][0] }}"
-  when:
-    - ceilometer_database_type == "mysql"
-    - "'FAILED' in mysql_access.stdout"
-
-- name: Creating Ceilometer database user and setting permissions
-  command: docker exec -t kolla_toolbox /usr/bin/ansible localhost
-    -m mysql_user
-    -a "login_host='{{ ceilometer_database_mysql_address }}'
-        login_port='{{ ceilometer_database_port }}'
-        login_user='{{ database_user }}'
-        login_password='{{ database_password }}'
-        name='{{ ceilometer_database_name }}'
-        password='{{ ceilometer_database_password }}'
-        host='%'
-        priv='{{ ceilometer_database_name }}.*:ALL'
-        append_privs='yes'"
-  register: database_user_create
-  changed_when: "{{ database_user_create.stdout.find('localhost | SUCCESS => ') != -1 and
-                    (database_user_create.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed }}"
-  failed_when: database_user_create.stdout.split()[2] != 'SUCCESS'
-  run_once: True
-  delegate_to: "{{ groups['ceilometer-api'][0] }}"
-  when:
-    - ceilometer_database_type == "mysql"
-    - "'FAILED' in mysql_access.stdout"
-
-# TODO(Jeffrey4l): fix idempotent when ceilomter_database_type == "gnocchi"
-# NOTE(vbel): bootstrapping of mysql db for ceilometer is idempotent
-- include: bootstrap_service.yml
-  when: ((ceilometer_database_type == "mongodb" and mongodb_ceilometer_database.changed)
-         or ceilometer_database_type == "mysql"
-         or ceilometer_database_type == "gnocchi")
diff --git a/ansible/roles/ceilometer/tasks/bootstrap_service.yml b/ansible/roles/ceilometer/tasks/bootstrap_service.yml
deleted file mode 100644
index 487b7999f..000000000
--- a/ansible/roles/ceilometer/tasks/bootstrap_service.yml
+++ /dev/null
@@ -1,22 +0,0 @@
----
-- name: Running Ceilometer bootstrap container
-  kolla_docker:
-    action: "start_container"
-    common_options: "{{ docker_common_options }}"
-    detach: False
-    environment:
-      KOLLA_BOOTSTRAP:
-      KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
-      CEILOMETER_DATABASE_TYPE: "{{ ceilometer_database_type }}"
-    image: "{{ ceilometer_api_image_full }}"
-    labels:
-      BOOTSTRAP:
-    name: "bootstrap_ceilometer"
-    restart_policy: "never"
-    volumes:
-      - "{{ node_config_directory }}/ceilometer-api/:{{ container_config_directory }}/:ro"
-      - "/etc/localtime:/etc/localtime:ro"
-      - "ceilometer:/var/lib/ceilometer/"
-      - "kolla_logs:/var/log/kolla/"
-  run_once: True
-  delegate_to: "{{ groups['ceilometer-api'][0] }}"
diff --git a/ansible/roles/ceilometer/tasks/config.yml b/ansible/roles/ceilometer/tasks/config.yml
deleted file mode 100644
index e4c6cdf7b..000000000
--- a/ansible/roles/ceilometer/tasks/config.yml
+++ /dev/null
@@ -1,78 +0,0 @@
----
-- name: Ensuring config directories exist
-  file:
-    path: "{{ node_config_directory }}/{{ item }}"
-    state: "directory"
-    recurse: yes
-  with_items:
-    - "ceilometer-notification"
-    - "ceilometer-collector"
-    - "ceilometer-api"
-    - "ceilometer-central"
-    - "ceilometer-compute"
-
-- name: Copying over config.json files for services
-  template:
-    src: "{{ item }}.json.j2"
-    dest: "{{ node_config_directory }}/{{ item }}/config.json"
-  with_items:
-    - "ceilometer-notification"
-    - "ceilometer-collector"
-    - "ceilometer-api"
-    - "ceilometer-central"
-    - "ceilometer-compute"
-
-- name: Copying over ceilometer-api.conf
-  template:
-    src: "{{ item }}"
-    dest: "{{ node_config_directory }}/ceilometer-api/wsgi-ceilometer-api.conf"
-  with_first_found:
-    - "{{ node_custom_config }}/ceilometer/{{ inventory_hostname }}/wsgi-ceilometer-api.conf"
-    - "{{ node_custom_config }}/ceilometer/wsgi-ceilometer-api.conf"
-    - "wsgi-ceilometer-api.conf.j2"
-
-- name: Copying over ceilometer.conf
-  merge_configs:
-    vars:
-      service_name: "{{ item }}"
-    sources:
-      - "{{ role_path }}/templates/ceilometer.conf.j2"
-      - "{{ node_custom_config }}/global.conf"
-      - "{{ node_custom_config }}/database.conf"
-      - "{{ node_custom_config }}/messaging.conf"
-      - "{{ node_custom_config }}/ceilometer.conf"
-      - "{{ node_custom_config }}/ceilometer/{{ item }}.conf"
-      - "{{ node_custom_config }}/ceilometer/{{ inventory_hostname }}/ceilometer.conf"
-    dest: "{{ node_config_directory }}/{{ item }}/ceilometer.conf"
-  with_items:
-    - "ceilometer-notification"
-    - "ceilometer-collector"
-    - "ceilometer-api"
-    - "ceilometer-central"
-    - "ceilometer-compute"
-
-- name: Copying over event and pipeline yaml for notification service
-  template:
-    src: "{{ item }}.j2"
-    dest: "{{ node_config_directory }}/ceilometer-notification/{{ item }}"
-  with_items:
-    - "event_definitions.yaml"
-    - "event_pipeline.yaml"
-    - "pipeline.yaml"
-
-- name: Check if policies shall be overwritten
-  local_action: stat path="{{ node_custom_config }}/ceilometer/policy.json"
-  register: ceilometer_policy
-
-- name: Copying over existing policy.json
-  template:
-    src: "{{ node_custom_config }}/ceilometer/policy.json"
-    dest: "{{ node_config_directory }}/{{ item }}/policy.json"
-  with_items:
-    - "ceilometer-notification"
-    - "ceilometer-collector"
-    - "ceilometer-api"
-    - "ceilometer-central"
-    - "ceilometer-compute"
-  when:
-    ceilometer_policy.stat.exists
diff --git a/ansible/roles/ceilometer/tasks/deploy.yml b/ansible/roles/ceilometer/tasks/deploy.yml
deleted file mode 100644
index 7f219ae9a..000000000
--- a/ansible/roles/ceilometer/tasks/deploy.yml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-- include: register.yml
-  when: inventory_hostname in groups['ceilometer']
-
-- include: config.yml
-  when: inventory_hostname in groups['ceilometer'] or
-        inventory_hostname in groups['compute']
-
-- include: bootstrap.yml
-  when: inventory_hostname in groups['ceilometer']
-
-- include: start.yml
-  when: inventory_hostname in groups['ceilometer'] or
-        inventory_hostname in groups['compute']
diff --git a/ansible/roles/ceilometer/tasks/main.yml b/ansible/roles/ceilometer/tasks/main.yml
deleted file mode 100644
index b017e8b4a..000000000
--- a/ansible/roles/ceilometer/tasks/main.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-- include: "{{ action }}.yml"
diff --git a/ansible/roles/ceilometer/tasks/precheck.yml b/ansible/roles/ceilometer/tasks/precheck.yml
deleted file mode 100644
index ed97d539c..000000000
--- a/ansible/roles/ceilometer/tasks/precheck.yml
+++ /dev/null
@@ -1 +0,0 @@
----
diff --git a/ansible/roles/ceilometer/tasks/pull.yml b/ansible/roles/ceilometer/tasks/pull.yml
deleted file mode 100644
index 0105e02d6..000000000
--- a/ansible/roles/ceilometer/tasks/pull.yml
+++ /dev/null
@@ -1,35 +0,0 @@
----
-- name: Pulling ceilometer-notification image
-  kolla_docker:
-    action: "pull_image"
-    common_options: "{{ docker_common_options }}"
-    image: "{{ ceilometer_notification_image_full }}"
-  when: inventory_hostname in groups['ceilometer-notification']
-
-- name: Pulling ceilometer-api image
-  kolla_docker:
-    action: "pull_image"
-    common_options: "{{ docker_common_options }}"
-    image: "{{ ceilometer_api_image_full }}"
-  when: inventory_hostname in groups['ceilometer-api']
-
-- name: Pulling ceilometer-central image
-  kolla_docker:
-    action: "pull_image"
-    common_options: "{{ docker_common_options }}"
-    image: "{{ ceilometer_central_image_full }}"
-  when: inventory_hostname in groups['ceilometer-central']
-
-- name: Pulling ceilometer-collector image
-  kolla_docker:
-    action: "pull_image"
-    common_options: "{{ docker_common_options }}"
-    image: "{{ ceilometer_collector_image_full }}"
-  when: inventory_hostname in groups['ceilometer-collector']
-
-- name: Pulling ceilometer-compute image
-  kolla_docker:
-    action: "pull_image"
-    common_options: "{{ docker_common_options }}"
-    image: "{{ ceilometer_compute_image_full }}"
-  when: inventory_hostname in groups['ceilometer-compute']
diff --git a/ansible/roles/ceilometer/tasks/reconfigure.yml b/ansible/roles/ceilometer/tasks/reconfigure.yml
deleted file mode 100644
index e0e1df510..000000000
--- a/ansible/roles/ceilometer/tasks/reconfigure.yml
+++ /dev/null
@@ -1,84 +0,0 @@
----
-- name: Ensuring the containers up
-  kolla_docker:
-    name: "{{ item.name }}"
-    action: "get_container_state"
-  register: container_state
-  failed_when: container_state.Running == false
-  when: inventory_hostname in groups[item.group]
-  with_items:
-    - { name: ceilometer_api, group: ceilometer-api }
-    - { name: ceilometer_central, group: ceilometer-central }
-    - { name: ceilometer_notification, group: ceilometer-notification }
-    - { name: ceilometer_collector, group: ceilometer-collector }
-    - { name: ceilometer_compute, group: ceilometer-compute }
-
-- include: config.yml
-
-- name: Check the configs
-  command: docker exec {{ item.name }} /usr/local/bin/kolla_set_configs --check
-  changed_when: false
-  failed_when: false
-  register: check_results
-  when: inventory_hostname in groups[item.group]
-  with_items:
-    - { name: ceilometer_api, group: ceilometer-api }
-    - { name: ceilometer_central, group: ceilometer-central }
-    - { name: ceilometer_notification, group: ceilometer-notification }
-    - { name: ceilometer_collector, group: ceilometer-collector }
-    - { name: ceilometer_compute, group: ceilometer-compute }
-
-# NOTE(jeffrey4l): when config_strategy == 'COPY_ALWAYS'
-# and container env['KOLLA_CONFIG_STRATEGY'] == 'COPY_ONCE',
-# just remove the container and start again
-- name: Containers config strategy
-  kolla_docker:
-    name: "{{ item.name }}"
-    action: "get_container_env"
-  register: container_envs
-  when: inventory_hostname in groups[item.group]
-  with_items:
-    - { name: ceilometer_api, group: ceilometer-api }
-    - { name: ceilometer_central, group: ceilometer-central }
-    - { name: ceilometer_notification, group: ceilometer-notification }
-    - { name: ceilometer_collector, group: ceilometer-collector }
-    - { name: ceilometer_compute, group: ceilometer-compute }
-
-- name: Remove the containers
-  kolla_docker:
-    name: "{{ item[0]['name'] }}"
-    action: "remove_container"
-  register: remove_containers
-  when:
-    - inventory_hostname in groups[item[0]['group']]
-    - config_strategy == "COPY_ONCE" or item[1]['KOLLA_CONFIG_STRATEGY'] == 'COPY_ONCE'
-    - item[2]['rc'] == 1
-  with_together:
-    - [{ name: ceilometer_api, group: ceilometer-api },
-       { name: ceilometer_central, group: ceilometer-central },
-       { name: ceilometer_notification, group: ceilometer-notification },
-       { name: ceilometer_collector, group: ceilometer-collector },
-       { name: ceilometer_compute, group: ceilometer-compute }]
-    - "{{ container_envs.results }}"
-    - "{{ check_results.results }}"
-
-- include: start.yml
-  when: remove_containers.changed
-
-- name: Restart containers
-  kolla_docker:
-    name: "{{ item[0]['name'] }}"
-    action: "restart_container"
-  when:
-    - inventory_hostname in groups[item[0]['group']]
-    - config_strategy == 'COPY_ALWAYS'
-    - item[1]['KOLLA_CONFIG_STRATEGY'] != 'COPY_ONCE'
-    - item[2]['rc'] == 1
-  with_together:
-    - [{ name: ceilometer_api, group: ceilometer-api },
-       { name: ceilometer_central, group: ceilometer-central },
-       { name: ceilometer_notification, group: ceilometer-notification },
-       { name: ceilometer_collector, group: ceilometer-collector },
-       { name: ceilometer_compute, group: ceilometer-compute }]
-    - "{{ container_envs.results }}"
-    - "{{ check_results.results }}"
diff --git a/ansible/roles/ceilometer/tasks/register.yml b/ansible/roles/ceilometer/tasks/register.yml
deleted file mode 100644
index c3cdd1a15..000000000
--- a/ansible/roles/ceilometer/tasks/register.yml
+++ /dev/null
@@ -1,40 +0,0 @@
----
-- name: Creating the Ceilometer service and endpoint
-  command: docker exec -t kolla_toolbox /usr/bin/ansible localhost
-    -m kolla_keystone_service
-    -a "service_name=ceilometer
-        service_type=metering
-        description='Openstack Telemetry'
-        endpoint_region={{ openstack_region_name }}
-        url='{{ item.url }}'
-        interface='{{ item.interface }}'
-        region_name={{ openstack_region_name }}
-        auth={{ '{{ openstack_ceilometer_auth }}' }}"
-    -e "{'openstack_ceilometer_auth':{{ openstack_ceilometer_auth }}}"
-  register: ceilometer_endpoint
-  changed_when: "{{ ceilometer_endpoint.stdout.find('localhost | SUCCESS => ') != -1 and (ceilometer_endpoint.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed }}"
-  until: ceilometer_endpoint.stdout.split()[2] == 'SUCCESS'
-  retries: 10
-  delay: 5
-  run_once: True
-  with_items:
-    - {'interface': 'admin', 'url': '{{ ceilometer_admin_endpoint }}'}
-    - {'interface': 'internal', 'url': '{{ ceilometer_internal_endpoint }}'}
-    - {'interface': 'public', 'url': '{{ ceilometer_public_endpoint }}'}
-
-- name: Creating the Ceilometer project, user, and role
-  command: docker exec -t kolla_toolbox /usr/bin/ansible localhost
-    -m kolla_keystone_user
-    -a "project=service
-        user=ceilometer
-        password={{ ceilometer_keystone_password }}
-        role=admin
-        region_name={{ openstack_region_name }}
-        auth={{ '{{ openstack_ceilometer_auth }}' }}"
-    -e "{'openstack_ceilometer_auth':{{ openstack_ceilometer_auth }}}"
-  register: ceilometer_user
-  changed_when: "{{ ceilometer_user.stdout.find('localhost | SUCCESS => ') != -1 and (ceilometer_user.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed }}"
-  until: ceilometer_user.stdout.split()[2] == 'SUCCESS'
-  retries: 10
-  delay: 5
-  run_once: True
diff --git a/ansible/roles/ceilometer/tasks/start.yml b/ansible/roles/ceilometer/tasks/start.yml
deleted file mode 100644
index 4cd760e5b..000000000
--- a/ansible/roles/ceilometer/tasks/start.yml
+++ /dev/null
@@ -1,67 +0,0 @@
----
-- name: Starting ceilometer-notification container
-  kolla_docker:
-    action: "start_container"
-    common_options: "{{ docker_common_options }}"
-    image: "{{ ceilometer_notification_image_full }}"
-    name: "ceilometer_notification"
-    volumes:
-      - "{{ node_config_directory }}/ceilometer-notification/:{{ container_config_directory }}/:ro"
-      - "/etc/localtime:/etc/localtime:ro"
-      - "kolla_logs:/var/log/kolla/"
-  when: inventory_hostname in groups['ceilometer-notification']
-
-- name: Starting ceilometer-api container
-  kolla_docker:
-    action: "start_container"
-    common_options: "{{ docker_common_options }}"
-    image: "{{ ceilometer_api_image_full }}"
-    name: "ceilometer_api"
-    volumes:
-      - "{{ node_config_directory }}/ceilometer-api/:{{ container_config_directory }}/:ro"
-      - "/etc/localtime:/etc/localtime:ro"
-      - "ceilometer:/var/lib/ceilometer/"
-      - "kolla_logs:/var/log/kolla/"
-  when: inventory_hostname in groups['ceilometer-api']
-
-- name: Starting ceilometer-central container
-  kolla_docker:
-    action: "start_container"
-    common_options: "{{ docker_common_options }}"
-    image: "{{ ceilometer_central_image_full }}"
-    name: "ceilometer_central"
-    volumes:
-      - "{{ node_config_directory }}/ceilometer-central/:{{ container_config_directory }}/:ro"
-      - "/etc/localtime:/etc/localtime:ro"
-      - "ceilometer:/var/lib/ceilometer/"
-      - "kolla_logs:/var/log/kolla/"
-  when: inventory_hostname in groups['ceilometer-central']
-
-- name: Starting ceilometer-collector container
-  kolla_docker:
-    action: "start_container"
-    common_options: "{{ docker_common_options }}"
-    image: "{{ ceilometer_collector_image_full }}"
-    name: "ceilometer_collector"
-    volumes:
-      - "{{ node_config_directory }}/ceilometer-collector/:{{ container_config_directory }}/:ro"
-      - "/etc/localtime:/etc/localtime:ro"
-      - "ceilometer:/var/lib/ceilometer/"
-      - "kolla_logs:/var/log/kolla/"
-  when: inventory_hostname in groups['ceilometer-collector']
-
-- name: Starting ceilometer-compute container
-  kolla_docker:
-    action: "start_container"
-    common_options: "{{ docker_common_options }}"
-    image: "{{ ceilometer_compute_image_full }}"
-    name: "ceilometer_compute"
-    privileged: True
-    volumes:
-      - "{{ node_config_directory }}/ceilometer-compute/:{{ container_config_directory }}/:ro"
-      - "/etc/localtime:/etc/localtime:ro"
-      - "/run/:/run/:shared"
-      - "ceilometer:/var/lib/ceilometer/"
-      - "kolla_logs:/var/log/kolla/"
-      - "nova_libvirt:/var/lib/libvirt"
-  when: inventory_hostname in groups['ceilometer-compute']
diff --git a/ansible/roles/ceilometer/tasks/upgrade.yml b/ansible/roles/ceilometer/tasks/upgrade.yml
deleted file mode 100644
index 308053080..000000000
--- a/ansible/roles/ceilometer/tasks/upgrade.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-- include: config.yml
-
-- include: bootstrap_service.yml
-
-- include: start.yml
diff --git a/ansible/roles/ceilometer/templates/ceilometer-api.json.j2 b/ansible/roles/ceilometer/templates/ceilometer-api.json.j2
deleted file mode 100644
index ed8ae5ebe..000000000
--- a/ansible/roles/ceilometer/templates/ceilometer-api.json.j2
+++ /dev/null
@@ -1,20 +0,0 @@
-{% set apache_cmd = 'apache2' if kolla_base_distro in ['ubuntu', 'debian'] else 'httpd' %}
-{% set apache_dir = 'apache2/conf-enabled' if kolla_base_distro in ['ubuntu', 'debian'] else 'httpd/conf.d' %}
-{% set apache_file = '000-default.conf' if kolla_base_distro in ['ubuntu', 'debian'] else 'ceilometer-api.conf' %}
-{
-    "command": "/usr/sbin/{{ apache_cmd }} -DFOREGROUND",
-    "config_files": [
-        {
-            "source": "{{ container_config_directory }}/ceilometer.conf",
-            "dest": "/etc/ceilometer/ceilometer.conf",
-            "owner": "ceilometer",
-            "perm": "0600"
-        },
-        {
-            "source": "{{ container_config_directory }}/wsgi-ceilometer-api.conf",
-            "dest": "/etc/{{ apache_dir }}/{{ apache_file }}",
-            "owner": "ceilometer",
-            "perm": "0644"
-        }
-    ]
-}
diff --git a/ansible/roles/ceilometer/templates/ceilometer-central.json.j2 b/ansible/roles/ceilometer/templates/ceilometer-central.json.j2
deleted file mode 100644
index e879afd59..000000000
--- a/ansible/roles/ceilometer/templates/ceilometer-central.json.j2
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    "command": "ceilometer-polling --polling-namespaces central",
-    "config_files": [
-        {
-            "source": "{{ container_config_directory }}/ceilometer.conf",
-            "dest": "/etc/ceilometer/ceilometer.conf",
-            "owner": "ceilometer",
-            "perm": "0600"
-        }
-    ]
-}
diff --git a/ansible/roles/ceilometer/templates/ceilometer-collector.json.j2 b/ansible/roles/ceilometer/templates/ceilometer-collector.json.j2
deleted file mode 100644
index 32970e127..000000000
--- a/ansible/roles/ceilometer/templates/ceilometer-collector.json.j2
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    "command": "ceilometer-collector",
-    "config_files": [
-        {
-            "source": "{{ container_config_directory }}/ceilometer.conf",
-            "dest": "/etc/ceilometer/ceilometer.conf",
-            "owner": "ceilometer",
-            "perm": "0600"
-        }
-    ]
-}
diff --git a/ansible/roles/ceilometer/templates/ceilometer-compute.json.j2 b/ansible/roles/ceilometer/templates/ceilometer-compute.json.j2
deleted file mode 100644
index b8ed69455..000000000
--- a/ansible/roles/ceilometer/templates/ceilometer-compute.json.j2
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    "command": "ceilometer-polling --polling-namespaces compute",
-    "config_files": [
-        {
-            "source": "{{ container_config_directory }}/ceilometer.conf",
-            "dest": "/etc/ceilometer/ceilometer.conf",
-            "owner": "ceilometer",
-            "perm": "0600"
-        }
-    ]
-}
diff --git a/ansible/roles/ceilometer/templates/ceilometer-notification.json.j2 b/ansible/roles/ceilometer/templates/ceilometer-notification.json.j2
deleted file mode 100644
index 769a8c8ce..000000000
--- a/ansible/roles/ceilometer/templates/ceilometer-notification.json.j2
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-    "command": "ceilometer-agent-notification",
-    "config_files": [
-        {
-            "source": "{{ container_config_directory }}/ceilometer.conf",
-            "dest": "/etc/ceilometer/ceilometer.conf",
-            "owner": "ceilometer",
-            "perm": "0600"
-        },
-        {
-            "source": "{{ container_config_directory }}/event_definitions.yaml",
-            "dest": "/etc/ceilometer/event_definitions.yaml",
-            "owner": "ceilometer",
-            "perm": "0600"
-        },
-        {
-            "source": "{{ container_config_directory }}/event_pipeline.yaml",
-            "dest": "/etc/ceilometer/event_pipeline.yaml",
-            "owner": "ceilometer",
-            "perm": "0600"
-        },
-        {
-            "source": "{{ container_config_directory }}/pipeline.yaml",
-            "dest": "/etc/ceilometer/pipeline.yaml",
-            "owner": "ceilometer",
-            "perm": "0600"
-        }
-    ]
-}
diff --git a/ansible/roles/ceilometer/templates/ceilometer.conf.j2 b/ansible/roles/ceilometer/templates/ceilometer.conf.j2
deleted file mode 100644
index 91f520541..000000000
--- a/ansible/roles/ceilometer/templates/ceilometer.conf.j2
+++ /dev/null
@@ -1,64 +0,0 @@
-[DEFAULT]
-debug = {{ ceilometer_logging_debug }}
-
-log_dir = /var/log/kolla/ceilometer
-
-transport_url = rabbit://{% for host in groups['rabbitmq'] %}{{ rabbitmq_user }}:{{ rabbitmq_password }}@{{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ rabbitmq_port }}{% if not loop.last %},{% endif %}{% endfor %}
-
-{% if ceilometer_database_type == 'gnocchi' %}
-meter_dispatchers = gnocchi
-event_dispatchers = gnocchi
-{% else %}
-meter_dispatchers = database
-event_dispatchers = database
-{% endif %}
-
-[api]
-port = {{ ceilometer_api_port }}
-host = {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}
-
-[collector]
-
-[database]
-{% if ceilometer_database_type == "mongodb" %}
-event_connection = mongodb://{{ ceilometer_database_user }}:{{ ceilometer_database_password }}@{{ ceilometer_database_mongodb_address }}/{{ ceilometer_database_name }}
-metering_connection = mongodb://{{ ceilometer_database_user }}:{{ ceilometer_database_password }}@{{ ceilometer_database_mongodb_address }}/{{ ceilometer_database_name }}
-{% elif ceilometer_database_type == "mysql" %}
-event_connection = mysql+pymysql://{{ ceilometer_database_user }}:{{ ceilometer_database_password }}@{{ ceilometer_database_mysql_address }}:{{ ceilometer_database_port }}/{{ ceilometer_database_name }}
-metering_connection = mysql+pymysql://{{ ceilometer_database_user }}:{{ ceilometer_database_password }}@{{ ceilometer_database_mysql_address }}:{{ ceilometer_database_port }}/{{ ceilometer_database_name }}
-{% endif %}
-
-[keystone_authtoken]
-auth_uri = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_public_port }}
-project_domain_name = Default
-project_name = service
-user_domain_name = Default
-username = {{ ceilometer_keystone_user }}
-password = {{ ceilometer_keystone_password }}
-auth_url = {{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_admin_port }}
-auth_type = password
-
-memcache_security_strategy = ENCRYPT
-memcache_secret_key = {{ memcache_secret_key }}
-memcached_servers = {% for host in groups['memcached'] %}{{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ memcached_port }}{% if not loop.last %},{% endif %}{% endfor %}
-
-
-[notification]
-store_events = true
-
-[service_credentials]
-auth_url = {{ internal_protocol  }}://{{ kolla_internal_fqdn }}:{{ keystone_public_port }}/v3
-region_name = {{ openstack_region_name }}
-password = {{ ceilometer_keystone_password }}
-username = {{ ceilometer_keystone_user }}
-project_name = service
-project_domain_id = default
-user_domain_id = default
-auth_type = password
-
-{% if ceilometer_database_type == 'gnocchi' %}
-[dispatcher_gnocchi]
-filter_service_activity = False
-url = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ gnocchi_api_port }}
-archive_policy = low
-{% endif %}
diff --git a/ansible/roles/ceilometer/templates/event_definitions.yaml.j2 b/ansible/roles/ceilometer/templates/event_definitions.yaml.j2
deleted file mode 100644
index 5f0d82ae5..000000000
--- a/ansible/roles/ceilometer/templates/event_definitions.yaml.j2
+++ /dev/null
@@ -1,553 +0,0 @@
----
-- event_type: compute.instance.*
-  traits: &instance_traits
-    tenant_id:
-      fields: payload.tenant_id
-    user_id:
-      fields: payload.user_id
-    instance_id:
-      fields: payload.instance_id
-    host:
-      fields: publisher_id.`split(., 1, 1)`
-    service:
-      fields: publisher_id.`split(., 0, -1)`
-    memory_mb:
-      type: int
-      fields: payload.memory_mb
-    disk_gb:
-      type: int
-      fields: payload.disk_gb
-    root_gb:
-      type: int
-      fields: payload.root_gb
-    ephemeral_gb:
-      type: int
-      fields: payload.ephemeral_gb
-    vcpus:
-      type: int
-      fields: payload.vcpus
-    instance_type_id:
-      type: int
-      fields: payload.instance_type_id
-    instance_type:
-      fields: payload.instance_type
-    state:
-      fields: payload.state
-    os_architecture:
-      fields: payload.image_meta.'org.openstack__1__architecture'
-    os_version:
-      fields: payload.image_meta.'org.openstack__1__os_version'
-    os_distro:
-      fields: payload.image_meta.'org.openstack__1__os_distro'
-    launched_at:
-      type: datetime
-      fields: payload.launched_at
-    deleted_at:
-      type: datetime
-      fields: payload.deleted_at
-- event_type: compute.instance.exists
-  traits:
-    <<: *instance_traits
-    audit_period_beginning:
-      type: datetime
-      fields: payload.audit_period_beginning
-    audit_period_ending:
-      type: datetime
-      fields: payload.audit_period_ending
-- event_type: ['volume.exists', 'volume.create.*', 'volume.delete.*', 'volume.resize.*', 'volume.attach.*', 'volume.detach.*', 'volume.update.*', 'snapshot.exists', 'snapshot.create.*', 'snapshot.delete.*', 'snapshot.update.*']
-  traits: &cinder_traits
-    user_id:
-      fields: payload.user_id
-    project_id:
-      fields: payload.tenant_id
-    availability_zone:
-      fields: payload.availability_zone
-    display_name:
-      fields: payload.display_name
-    replication_status:
-      fields: payload.replication_status
-    status:
-      fields: payload.status
-    created_at:
-      fields: payload.created_at
-- event_type: ['volume.exists', 'volume.create.*', 'volume.delete.*', 'volume.resize.*', 'volume.attach.*', 'volume.detach.*', 'volume.update.*']
-  traits:
-    <<: *cinder_traits
-    resource_id:
-      fields: payload.volume_id
-    host:
-      fields: payload.host
-    size:
-      fields: payload.size
-    type:
-      fields: payload.volume_type
-    replication_status:
-      fields: payload.replication_status
-- event_type: ['snapshot.exists', 'snapshot.create.*', 'snapshot.delete.*', 'snapshot.update.*']
-  traits:
-    <<: *cinder_traits
-    resource_id:
-      fields: payload.snapshot_id
-    volume_id:
-      fields: payload.volume_id
-- event_type: ['image_volume_cache.*']
-  traits:
-    image_id:
-      fields: payload.image_id
-    host:
-      fields: payload.host
-- event_type: ['image.update', 'image.upload', 'image.delete']
-  traits: &glance_crud
-    project_id:
-      fields: payload.owner
-    resource_id:
-      fields: payload.id
-    name:
-      fields: payload.name
-    status:
-      fields: payload.status
-    created_at:
-      fields: payload.created_at
-    user_id:
-      fields: payload.owner
-    deleted_at:
-      fields: payload.deleted_at
-    size:
-      fields: payload.size
-- event_type: image.send
-  traits: &glance_send
-    receiver_project:
-      fields: payload.receiver_tenant_id
-    receiver_user:
-      fields: payload.receiver_user_id
-    user_id:
-      fields: payload.owner_id
-    image_id:
-      fields: payload.image_id
-    destination_ip:
-      fields: payload.destination_ip
-    bytes_sent:
-      fields: payload.bytes_sent
-- event_type: orchestration.stack.*
-  traits: &orchestration_crud
-    project_id:
-      fields: payload.tenant_id
-    user_id:
-      fields: ['_context_trustor_user_id', '_context_user_id']
-    resource_id:
-      fields: payload.stack_identity
-- event_type: sahara.cluster.*
-  traits: &sahara_crud
-    project_id:
-      fields: payload.project_id
-    user_id:
-      fields: _context_user_id
-    resource_id:
-      fields: payload.cluster_id
-- event_type: sahara.cluster.health
-  traits: &sahara_health
-    <<: *sahara_crud
-    verification_id:
-      fields: payload.verification_id
-    health_check_status:
-      fields: payload.health_check_status
-    health_check_name:
-      fields: payload.health_check_name
-    health_check_description:
-      fields: payload.health_check_description
-    created_at:
-      type: datetime
-      fields: payload.created_at
-    updated_at:
-      type: datetime
-      fields: payload.updated_at
-- event_type: ['identity.user.*', 'identity.project.*', 'identity.group.*', 'identity.role.*', 'identity.OS-TRUST:trust.*',
-               'identity.region.*', 'identity.service.*', 'identity.endpoint.*', 'identity.policy.*']
-  traits: &identity_crud
-    resource_id:
-      fields: payload.resource_info
-    initiator_id:
-      fields: payload.initiator.id
-    project_id:
-      fields: payload.initiator.project_id
-    domain_id:
-      fields: payload.initiator.domain_id
-- event_type: identity.role_assignment.*
-  traits: &identity_role_assignment
-    role:
-      fields: payload.role
-    group:
-      fields: payload.group
-    domain:
-      fields: payload.domain
-    user:
-      fields: payload.user
-    project:
-      fields: payload.project
-- event_type: identity.authenticate
-  traits: &identity_authenticate
-    typeURI:
-      fields: payload.typeURI
-    id:
-      fields: payload.id
-    action:
-      fields: payload.action
-    eventType:
-      fields: payload.eventType
-    eventTime:
-      fields: payload.eventTime
-    outcome:
-      fields: payload.outcome
-    initiator_typeURI:
-      fields: payload.initiator.typeURI
-    initiator_id:
-      fields: payload.initiator.id
-    initiator_name:
-      fields: payload.initiator.name
-    initiator_host_agent:
-      fields: payload.initiator.host.agent
-    initiator_host_addr:
-      fields: payload.initiator.host.address
-    target_typeURI:
-      fields: payload.target.typeURI
-    target_id:
-      fields: payload.target.id
-    observer_typeURI:
-      fields: payload.observer.typeURI
-    observer_id:
-      fields: payload.observer.id
-- event_type: objectstore.http.request
-  traits: &objectstore_request
-    typeURI:
-      fields: payload.typeURI
-    id:
-      fields: payload.id
-    action:
-      fields: payload.action
-    eventType:
-      fields: payload.eventType
-    eventTime:
-      fields: payload.eventTime
-    outcome:
-      fields: payload.outcome
-    initiator_typeURI:
-      fields: payload.initiator.typeURI
-    initiator_id:
-      fields: payload.initiator.id
-    initiator_project_id:
-      fields: payload.initiator.project_id
-    target_typeURI:
-      fields: payload.target.typeURI
-    target_id:
-      fields: payload.target.id
-    target_action:
-      fields: payload.target.action
-    target_metadata_path:
-      fields: payload.target.metadata.path
-    target_metadata_version:
-      fields: payload.target.metadata.version
-    target_metadata_container:
-      fields: payload.target.metadata.container
-    target_metadata_object:
-      fields: payload.target.metadata.object
-    observer_id:
-      fields: payload.observer.id
-- event_type: magnetodb.table.*
-  traits: &kv_store
-    resource_id:
-      fields: payload.table_uuid
-    user_id:
-      fields: _context_user_id
-    project_id:
-      fields: _context_tenant
-- event_type: ['network.*', 'subnet.*', 'port.*', 'router.*', 'floatingip.*', 'pool.*', 'vip.*', 'member.*', 'health_monitor.*', 'healthmonitor.*', 'listener.*', 'loadbalancer.*', 'firewall.*', 'firewall_policy.*', 'firewall_rule.*', 'vpnservice.*', 'ipsecpolicy.*', 'ikepolicy.*', 'ipsec_site_connection.*']
-  traits: &network_traits
-    user_id:
-      fields: _context_user_id
-    project_id:
-      fields: _context_tenant_id
-- event_type: network.*
-  traits:
-    <<: *network_traits
-    resource_id:
-      fields: ['payload.network.id', 'payload.id']
-- event_type: subnet.*
-  traits:
-    <<: *network_traits
-    resource_id:
-      fields: ['payload.subnet.id', 'payload.id']
-- event_type: port.*
-  traits:
-    <<: *network_traits
-    resource_id:
-      fields: ['payload.port.id', 'payload.id']
-- event_type: router.*
-  traits:
-    <<: *network_traits
-    resource_id:
-      fields: ['payload.router.id', 'payload.id']
-- event_type: floatingip.*
-  traits:
-    <<: *network_traits
-    resource_id:
-      fields: ['payload.floatingip.id', 'payload.id']
-- event_type: pool.*
-  traits:
-    <<: *network_traits
-    resource_id:
-      fields: ['payload.pool.id', 'payload.id']
-- event_type: vip.*
-  traits:
-    <<: *network_traits
-    resource_id:
-      fields: ['payload.vip.id', 'payload.id']
-- event_type: member.*
-  traits:
-    <<: *network_traits
-    resource_id:
-      fields: ['payload.member.id', 'payload.id']
-- event_type: health_monitor.*
-  traits:
-    <<: *network_traits
-    resource_id:
-      fields: ['payload.health_monitor.id', 'payload.id']
-- event_type: healthmonitor.*
-  traits:
-    <<: *network_traits
-    resource_id:
-      fields: ['payload.healthmonitor.id', 'payload.id']
-- event_type: listener.*
-  traits:
-    <<: *network_traits
-    resource_id:
-      fields: ['payload.listener.id', 'payload.id']
-- event_type: loadbalancer.*
-  traits:
-    <<: *network_traits
-    resource_id:
-      fields: ['payload.loadbalancer.id', 'payload.id']
-- event_type: firewall.*
-  traits:
-    <<: *network_traits
-    resource_id:
-      fields: ['payload.firewall.id', 'payload.id']
-- event_type: firewall_policy.*
-  traits:
-    <<: *network_traits
-    resource_id:
-      fields: ['payload.firewall_policy.id', 'payload.id']
-- event_type: firewall_rule.*
-  traits:
-    <<: *network_traits
-    resource_id:
-      fields: ['payload.firewall_rule.id', 'payload.id']
-- event_type: vpnservice.*
-  traits:
-    <<: *network_traits
-    resource_id:
-      fields: ['payload.vpnservice.id', 'payload.id']
-- event_type: ipsecpolicy.*
-  traits:
-    <<: *network_traits
-    resource_id:
-      fields: ['payload.ipsecpolicy.id', 'payload.id']
-- event_type: ikepolicy.*
-  traits:
-    <<: *network_traits
-    resource_id:
-      fields: ['payload.ikepolicy.id', 'payload.id']
-- event_type: ipsec_site_connection.*
-  traits:
-    <<: *network_traits
-    resource_id:
-      fields: ['payload.ipsec_site_connection.id', 'payload.id']
-- event_type: '*http.*'
-  traits: &http_audit
-    project_id:
-      fields: payload.initiator.project_id
-    user_id:
-      fields: payload.initiator.id
-    typeURI:
-      fields: payload.typeURI
-    eventType:
-      fields: payload.eventType
-    action:
-      fields: payload.action
-    outcome:
-      fields: payload.outcome
-    id:
-      fields: payload.id
-    eventTime:
-      fields: payload.eventTime
-    requestPath:
-      fields: payload.requestPath
-    observer_id:
-      fields: payload.observer.id
-    target_id:
-      fields: payload.target.id
-    target_typeURI:
-      fields: payload.target.typeURI
-    target_name:
-      fields: payload.target.name
-    initiator_typeURI:
-      fields: payload.initiator.typeURI
-    initiator_id:
-      fields: payload.initiator.id
-    initiator_name:
-      fields: payload.initiator.name
-    initiator_host_address:
-      fields: payload.initiator.host.address
-- event_type: '*http.response'
-  traits:
-    <<: *http_audit
-    reason_code:
-      fields: payload.reason.reasonCode
-- event_type: ['dns.domain.create', 'dns.domain.update', 'dns.domain.delete']
-  traits: &dns_domain_traits
-    status:
-      fields: payload.status
-    retry:
-      fields: payload.retry
-    description:
-      fields: payload.description
-    expire:
-      fields: payload.expire
-    email:
-      fields: payload.email
-    ttl:
-      fields: payload.ttl
-    action:
-      fields: payload.action
-    name:
-      fields: payload.name
-    resource_id:
-      fields: payload.id
-    created_at:
-      fields: payload.created_at
-    updated_at:
-      fields: payload.updated_at
-    version:
-      fields: payload.version
-    parent_domain_id:
-      fields: parent_domain_id
-    serial:
-      fields: payload.serial
-- event_type: dns.domain.exists
-  traits:
-    <<: *dns_domain_traits
-    audit_period_beginning:
-      type: datetime
-      fields: payload.audit_period_beginning
-    audit_period_ending:
-      type: datetime
-      fields: payload.audit_period_ending
-- event_type: trove.*
-  traits: &trove_base_traits
-    state:
-      fields: payload.state_description
-    instance_type:
-      fields: payload.instance_type
-    user_id:
-      fields: payload.user_id
-    resource_id:
-      fields: payload.instance_id
-    instance_type_id:
-      fields: payload.instance_type_id
-    launched_at:
-      type: datetime
-      fields: payload.launched_at
-    instance_name:
-      fields: payload.instance_name
-    state:
-      fields: payload.state
-    nova_instance_id:
-      fields: payload.nova_instance_id
-    service_id:
-      fields: payload.service_id
-    created_at:
-      type: datetime
-      fields: payload.created_at
-    region:
-      fields: payload.region
-- event_type: ['trove.instance.create', 'trove.instance.modify_volume', 'trove.instance.modify_flavor', 'trove.instance.delete']
-  traits: &trove_common_traits
-    name:
-      fields: payload.name
-    availability_zone:
-      fields: payload.availability_zone
-    instance_size:
-      type: int
-      fields: payload.instance_size
-    volume_size:
-      type: int
-      fields: payload.volume_size
-    nova_volume_id:
-      fields: payload.nova_volume_id
-- event_type: trove.instance.create
-  traits:
-    <<: [*trove_base_traits, *trove_common_traits]
-- event_type: trove.instance.modify_volume
-  traits:
-    <<: [*trove_base_traits, *trove_common_traits]
-    old_volume_size:
-      type: int
-      fields: payload.old_volume_size
-    modify_at:
-      type: datetime
-      fields: payload.modify_at
-- event_type: trove.instance.modify_flavor
-  traits:
-    <<: [*trove_base_traits, *trove_common_traits]
-    old_instance_size:
-      type: int
-      fields: payload.old_instance_size
-    modify_at:
-      type: datetime
-      fields: payload.modify_at
-- event_type: trove.instance.delete
-  traits:
-    <<: [*trove_base_traits, *trove_common_traits]
-    deleted_at:
-      type: datetime
-      fields: payload.deleted_at
-- event_type: trove.instance.exists
-  traits:
-    <<: *trove_base_traits
-    display_name:
-      fields: payload.display_name
-    audit_period_beginning:
-      type: datetime
-      fields: payload.audit_period_beginning
-    audit_period_ending:
-      type: datetime
-      fields: payload.audit_period_ending
-- event_type: profiler.*
-  traits:
-    project:
-      fields: payload.project
-    service:
-      fields: payload.service
-    name:
-      fields: payload.name
-    base_id:
-      fields: payload.base_id
-    trace_id:
-      fields: payload.trace_id
-    parent_id:
-      fields: payload.parent_id
-    timestamp:
-      fields: payload.timestamp
-    host:
-      fields: payload.info.host
-    path:
-      fields: payload.info.request.path
-    query:
-      fields: payload.info.request.query
-    method:
-      fields: payload.info.request.method
-    scheme:
-      fields: payload.info.request.scheme
-    db.statement:
-      fields: payload.info.db.statement
-    db.params:
-      fields: payload.info.db.params
diff --git a/ansible/roles/ceilometer/templates/event_pipeline.yaml.j2 b/ansible/roles/ceilometer/templates/event_pipeline.yaml.j2
deleted file mode 100644
index 10275f749..000000000
--- a/ansible/roles/ceilometer/templates/event_pipeline.yaml.j2
+++ /dev/null
@@ -1,13 +0,0 @@
----
-sources:
-    - name: event_source
-      events:
-          - "*"
-      sinks:
-          - event_sink
-sinks:
-    - name: event_sink
-      transformers:
-      triggers:
-      publishers:
-          - notifier://
diff --git a/ansible/roles/ceilometer/templates/pipeline.yaml.j2 b/ansible/roles/ceilometer/templates/pipeline.yaml.j2
deleted file mode 100644
index a5bd5148e..000000000
--- a/ansible/roles/ceilometer/templates/pipeline.yaml.j2
+++ /dev/null
@@ -1,92 +0,0 @@
----
-sources:
-    - name: meter_source
-      interval: 600
-      meters:
-          - "*"
-      sinks:
-          - meter_sink
-    - name: cpu_source
-      interval: 600
-      meters:
-          - "cpu"
-      sinks:
-          - cpu_sink
-          - cpu_delta_sink
-    - name: disk_source
-      interval: 600
-      meters:
-          - "disk.read.bytes"
-          - "disk.read.requests"
-          - "disk.write.bytes"
-          - "disk.write.requests"
-          - "disk.device.read.bytes"
-          - "disk.device.read.requests"
-          - "disk.device.write.bytes"
-          - "disk.device.write.requests"
-      sinks:
-          - disk_sink
-    - name: network_source
-      interval: 600
-      meters:
-          - "network.incoming.bytes"
-          - "network.incoming.packets"
-          - "network.outgoing.bytes"
-          - "network.outgoing.packets"
-      sinks:
-          - network_sink
-sinks:
-    - name: meter_sink
-      transformers:
-      publishers:
-          - notifier://
-    - name: cpu_sink
-      transformers:
-          - name: "rate_of_change"
-            parameters:
-                target:
-                    name: "cpu_util"
-                    unit: "%"
-                    type: "gauge"
-                    scale: "100.0 / (10**9 * (resource_metadata.cpu_number or 1))"
-      publishers:
-          - notifier://
-    - name: cpu_delta_sink
-      transformers:
-          - name: "delta"
-            parameters:
-                target:
-                    name: "cpu.delta"
-                growth_only: True
-      publishers:
-          - notifier://
-    - name: disk_sink
-      transformers:
-          - name: "rate_of_change"
-            parameters:
-                source:
-                    map_from:
-                        name: "(disk\\.device|disk)\\.(read|write)\\.(bytes|requests)"
-                        unit: "(B|request)"
-                target:
-                    map_to:
-                        name: "\\1.\\2.\\3.rate"
-                        unit: "\\1/s"
-                    type: "gauge"
-      publishers:
-          - notifier://
-    - name: network_sink
-      transformers:
-          - name: "rate_of_change"
-            parameters:
-                source:
-                   map_from:
-                       name: "network\\.(incoming|outgoing)\\.(bytes|packets)"
-                       unit: "(B|packet)"
-                target:
-                    map_to:
-                        name: "network.\\1.\\2.rate"
-                        unit: "\\1/s"
-                    type: "gauge"
-      publishers:
-          - notifier://
diff --git a/ansible/roles/ceilometer/templates/wsgi-ceilometer-api.conf.j2 b/ansible/roles/ceilometer/templates/wsgi-ceilometer-api.conf.j2
deleted file mode 100644
index 4adb84bf2..000000000
--- a/ansible/roles/ceilometer/templates/wsgi-ceilometer-api.conf.j2
+++ /dev/null
@@ -1,24 +0,0 @@
-{% set python_path = '/usr/lib/python2.7/site-packages' if kolla_install_type == 'binary' else '/var/lib/kolla/venv/lib/python2.7/site-packages' %}
-Listen {{ api_interface_address }}:{{ ceilometer_api_port }}
-
-<VirtualHost *:{{ ceilometer_api_port }}>
-    LogLevel info
-    ErrorLog /var/log/kolla/ceilometer/ceilometer-api.log
-    CustomLog /var/log/kolla/ceilometer/ceilometer-api-access.log combined
-
-    WSGIScriptReloading On
-    WSGIDaemonProcess ceilometer-api processes={{ openstack_service_workers }} threads=1 user=ceilometer group=ceilometer display-name=%{GROUP} python-path={{ python_path }}
-    WSGIProcessGroup ceilometer-api
-    WSGIScriptAlias / {{ python_path }}/ceilometer/api/app.wsgi
-
-    <Directory "{{ python_path }}/ceilometer/api">
-        <IfVersion >= 2.4>
-            Require all granted
-        </IfVersion>
-        <IfVersion < 2.4>
-            Order allow,deny
-            Allow from all
-        </IfVersion>
-    </Directory>
-
-</VirtualHost>