Merge "Provide support for ceilometer dev mode in kolla"

ansible/roles/ceilometer/defaults/main.yml

@@ -11,6 +11,7 @@ ceilometer_services:
       - "{{ node_config_directory }}/ceilometer-notification/:{{ container_config_directory }}/:ro"
       - "/etc/localtime:/etc/localtime:ro"
       - "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:
     container_name: ceilometer_central
     group: ceilometer-central
@@ -21,6 +22,7 @@ ceilometer_services:
       - "/etc/localtime:/etc/localtime:ro"
       - "ceilometer:/var/lib/ceilometer/"
       - "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:
     container_name: ceilometer_compute
     group: ceilometer-compute
@@ -34,6 +36,7 @@ ceilometer_services:
       - "ceilometer:/var/lib/ceilometer/"
       - "kolla_logs:/var/log/kolla/"
       - "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"
 
 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 }}"

ansible/roles/ceilometer/handlers/main.yml

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

ansible/roles/ceilometer/tasks/bootstrap_service.yml

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

ansible/roles/ceilometer/tasks/clone.yml

@@ -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 }}"

ansible/roles/ceilometer/tasks/config.yml

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

ansible/roles/ceilometer/tasks/deploy.yml

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