openstack/kolla-ansible
Code Issues Proposed changes

Merge "Provide support for ceilometer dev mode in kolla"

Browse Source
This commit is contained in:
Zuul 2018-07-16 08:38:13 +00:00 committed by Gerrit Code Review
commit 49903241fe
6 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ansible/roles/ceilometer/defaults/main.yml
View File

@ -11,6 +11,7 @@ ceilometer_services:
- "{{ node_config_directory }}/ceilometer-notification/:{{ container_config_directory }}/:ro" - "{{ node_config_directory }}/ceilometer-notification/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro" - "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla/" - "kolla_logs:/var/log/kolla/"
- "{{ kolla_dev_repos_directory ~ '/ceilometer/ceilometer:/var/lib/kolla/venv/lib/python2.7/site-packages/ceilometer' if ceilometer_dev_mode | bool else '' }}"
ceilometer-central: ceilometer-central:
container_name: ceilometer_central container_name: ceilometer_central
group: ceilometer-central group: ceilometer-central
@ -21,6 +22,7 @@ ceilometer_services:
- "/etc/localtime:/etc/localtime:ro" - "/etc/localtime:/etc/localtime:ro"
- "ceilometer:/var/lib/ceilometer/" - "ceilometer:/var/lib/ceilometer/"
- "kolla_logs:/var/log/kolla/" - "kolla_logs:/var/log/kolla/"
- "{{ kolla_dev_repos_directory ~ '/ceilometer/ceilometer:/var/lib/kolla/venv/lib/python2.7/site-packages/ceilometer' if ceilometer_dev_mode | bool else '' }}"
ceilometer-compute: ceilometer-compute:
container_name: ceilometer_compute container_name: ceilometer_compute
group: ceilometer-compute group: ceilometer-compute
@ -34,6 +36,7 @@ ceilometer_services:
- "ceilometer:/var/lib/ceilometer/" - "ceilometer:/var/lib/ceilometer/"
- "kolla_logs:/var/log/kolla/" - "kolla_logs:/var/log/kolla/"
- "nova_libvirt:/var/lib/libvirt" - "nova_libvirt:/var/lib/libvirt"
- "{{ kolla_dev_repos_directory ~ '/ceilometer/ceilometer:/var/lib/kolla/venv/lib/python2.7/site-packages/ceilometer' if ceilometer_dev_mode | bool else '' }}"
#################### ####################
@ -63,3 +66,11 @@ ceilometer_logging_debug: "{{ openstack_logging_debug }}"
ceilometer_keystone_user: "ceilometer" ceilometer_keystone_user: "ceilometer"
openstack_ceilometer_auth: "{{ openstack_auth }}" openstack_ceilometer_auth: "{{ openstack_auth }}"
####################
# Kolla
####################
ceilometer_git_repository: "{{ kolla_dev_repos_git }}/{{ project_name }}"
ceilometer_dev_repos_pull: "{{ kolla_dev_repos_pull }}"
ceilometer_dev_mode: "{{ kolla_dev_mode }}"

6
ansible/roles/ceilometer/handlers/main.yml
View File

@ -16,7 +16,7 @@
common_options: "{{ docker_common_options }}" common_options: "{{ docker_common_options }}"
name: "{{ service.container_name }}" name: "{{ service.container_name }}"
image: "{{ service.image }}" image: "{{ service.image }}"
volumes: "{{ service.volumes }}" volumes: "{{ service.volumes|reject('equalto', '')|list }}"
when: when:
- kolla_action != "config" - kolla_action != "config"
- inventory_hostname in groups[service.group] - inventory_hostname in groups[service.group]
@ -45,7 +45,7 @@
common_options: "{{ docker_common_options }}" common_options: "{{ docker_common_options }}"
name: "{{ service.container_name }}" name: "{{ service.container_name }}"
image: "{{ service.image }}" image: "{{ service.image }}"
volumes: "{{ service.volumes }}" volumes: "{{ service.volumes|reject('equalto', '')|list }}"
when: when:
- kolla_action != "config" - kolla_action != "config"
- inventory_hostname in groups[service.group] - inventory_hostname in groups[service.group]
@ -73,7 +73,7 @@
name: "{{ service.container_name }}" name: "{{ service.container_name }}"
image: "{{ service.image }}" image: "{{ service.image }}"
privileged: "{{ service.privileged | default(False) }}" privileged: "{{ service.privileged | default(False) }}"
volumes: "{{ service.volumes }}" volumes: "{{ service.volumes|reject('equalto', '')|list }}"
when: when:
- kolla_action != "config" - kolla_action != "config"
- inventory_hostname in groups[service.group] - inventory_hostname in groups[service.group]

2
ansible/roles/ceilometer/tasks/bootstrap_service.yml
View File

@ -11,7 +11,7 @@
KOLLA_BOOTSTRAP: KOLLA_BOOTSTRAP:
KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}" KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
CEILOMETER_DATABASE_TYPE: "gnocchi" CEILOMETER_DATABASE_TYPE: "gnocchi"
image: "{{ ceilometer_notification.image }}" image: "{{ ceilometer_notification.image | reject('equalto', '')|list }}"
labels: labels:
BOOTSTRAP: BOOTSTRAP:
name: "bootstrap_ceilometer" name: "bootstrap_ceilometer"

6
ansible/roles/ceilometer/tasks/clone.yml Normal file
View File

@ -0,0 +1,6 @@
---
- name: Cloning ceilometer source repository for development
git:
repo: "{{ ceilometer_git_repository }}"
dest: "{{ kolla_dev_repos_directory }}/{{ project_name }}"
update: "{{ ceilometer_dev_repos_pull }}"

2
ansible/roles/ceilometer/tasks/config.yml
View File

@ -195,7 +195,7 @@
name: "{{ item.value.container_name }}" name: "{{ item.value.container_name }}"
image: "{{ item.value.image }}" image: "{{ item.value.image }}"
privileged: "{{ item.value.privileged | default(False) }}" privileged: "{{ item.value.privileged | default(False) }}"
volumes: "{{ item.value.volumes }}" volumes: "{{ item.value.volumes | reject('equalto', '')|list }}"
register: check_ceilometer_containers register: check_ceilometer_containers
when: when:
- kolla_action != "config" - kolla_action != "config"

3
ansible/roles/ceilometer/tasks/deploy.yml
View File

@ -6,6 +6,9 @@
when: inventory_hostname in groups['ceilometer'] or when: inventory_hostname in groups['ceilometer'] or
inventory_hostname in groups['compute'] inventory_hostname in groups['compute']
- include: clone.yml
when: ceilometer_dev_mode | bool
- include: bootstrap.yml - include: bootstrap.yml
when: inventory_hostname in groups['ceilometer'] when: inventory_hostname in groups['ceilometer']