summaryrefslogtreecommitdiffstats
path: root/deploy/adapters/ansible/roles/ceilometer_controller/tasks
diff options
context:
space:
mode:
authorliyuenan <liyuenan@huawei.com>2017-01-14 11:31:08 +0800
committerJustin chi <chigang@huawei.com>2017-01-14 05:48:28 +0000
commit2e33f30a1f0a17692d6d0348248df10b98cfb498 (patch)
tree1f8d3612a4667bf977db5ce5a0cbe0696f06e78b /deploy/adapters/ansible/roles/ceilometer_controller/tasks
parent1da2cee07a11d5dd7b83ab0437807fc239929f1c (diff)
Deploy OpenStack Newton on CentOS hosts
JIRA: COMPASS-518 Make Centos Newton ppa. Update host Centos version to 7.3. Support Centos Newton Deploy. Support Ceph Deploy. Change-Id: I6dd110cc10d425a9d590e1dcb5777ade5cce96aa Signed-off-by: liyuenan <liyuenan@huawei.com>
Diffstat (limited to 'deploy/adapters/ansible/roles/ceilometer_controller/tasks')
-rw-r--r--deploy/adapters/ansible/roles/ceilometer_controller/tasks/ceilometer_config.yml26
1 files changed, 18 insertions, 8 deletions
diff --git a/deploy/adapters/ansible/roles/ceilometer_controller/tasks/ceilometer_config.yml b/deploy/adapters/ansible/roles/ceilometer_controller/tasks/ceilometer_config.yml
index 694cc0dd..b2d58d4b 100644
--- a/deploy/adapters/ansible/roles/ceilometer_controller/tasks/ceilometer_config.yml
+++ b/deploy/adapters/ansible/roles/ceilometer_controller/tasks/ceilometer_config.yml
@@ -9,25 +9,35 @@
---
- include_vars: "{{ ansible_os_family }}.yml"
+- name: assure listen port exist
+ lineinfile:
+ dest: '{{ apache_config_dir }}/ports.conf'
+ regexp: "^Listen {{ internal_ip }}:8777"
+ line: "Listen {{ internal_ip }}:8777"
+ notify: restart apache server
+
+- name: update apache2 configs
+ template:
+ src: wsgi-ceilometer.conf.j2
+ dest: '{{ apache_config_dir }}/sites-available/ceilometer.conf'
+ when: ansible_os_family == 'Debian'
+ notify: reload apache server
+
- name: update apache2 configs
template:
src: wsgi-ceilometer.conf.j2
- dest: /etc/apache2/sites-available/ceilometer.conf
+ dest: '{{ apache_config_dir }}/ceilometer.conf'
+ when: ansible_os_family == 'RedHat'
notify: reload apache server
- name: enable ceilometer server
file:
- src: /etc/apache2/sites-available/ceilometer.conf
- dest: /etc/apache2/sites-enabled/ceilometer.conf
+ src: "{{ apache_config_dir }}/sites-available/ceilometer.conf"
+ dest: "{{ apache_config_dir }}/sites-enabled/ceilometer.conf"
state: "link"
when: ansible_os_family == 'Debian'
notify: reload apache server
-- name: assure listen port exist
- shell: echo "Listen {{ internal_ip }}:8777" >> /etc/apache2/ports.conf
- notify:
- - restart apache server
-
- name: copy glance & cinder configs
template:
src: "{{ item }}"