diff --git a/ansible/roles/ceilometer/tasks/upgrade.yml b/ansible/roles/ceilometer/tasks/upgrade.yml index 93431db991..c38db1adf4 100644 --- a/ansible/roles/ceilometer/tasks/upgrade.yml +++ b/ansible/roles/ceilometer/tasks/upgrade.yml @@ -3,17 +3,5 @@ - include: bootstrap_service.yml -# TODO(jeffrey4l): ceilometer-api and ceilometer-collector are marked as -# deprecated and will be removed already. Upgrade to Pike should remove -# ceilometer-api and ceilometer-collector container. This task should be -# remove in Q cycle. -- name: Containers are being removed - kolla_docker: - name: "{{ item }}" - action: remove_container - with_items: - - ceilometer_api - - ceilometer_collector - - name: Flush handlers meta: flush_handlers 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 fccdc6f6ab..0000000000 --- a/ansible/roles/ceilometer/templates/ceilometer-api.json.j2 +++ /dev/null @@ -1,21 +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" - } - ], - "permissions": [ - { - "path": "/var/log/kolla/ceilometer", - "owner": "ceilometer:ceilometer", - "recurse": true - } - ] -}