openstack/kolla-ansible
Code Issues Proposed changes

Merge "dev mode: Add support for blazar"

Browse Source
This commit is contained in:
Zuul
2018-07-03 13:48:25 +00:00
committed by Gerrit Code Review
parent 80916b3678 8da9379269
commit 19d79f9484
6 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,6 +11,7 @@ blazar_services:
- "{{ node_config_directory }}/blazar-api/:{{ container_config_directory }}/:ro" - "{{ node_config_directory }}/blazar-api/:{{ 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 ~ '/blazar/blazar:/var/lib/kolla/venv/lib/python2.7/site-packages/blazar' if blazar_dev_mode | bool else '' }}"
blazar-manager: blazar-manager:
container_name: blazar_manager container_name: blazar_manager
group: blazar-manager group: blazar-manager
@@ -20,6 +21,8 @@ blazar_services:
- "{{ node_config_directory }}/blazar-manager/:{{ container_config_directory }}/:ro" - "{{ node_config_directory }}/blazar-manager/:{{ 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 ~ '/blazar/blazar:/var/lib/kolla/venv/lib/python2.7/site-packages/blazar' if blazar_dev_mode | bool else '' }}"
#################### ####################
# Blazar # Blazar
@@ -61,3 +64,11 @@ blazar_logging_debug: "{{ openstack_logging_debug }}"
blazar_keystone_user: "blazar" blazar_keystone_user: "blazar"
openstack_blazar_auth: "{{ openstack_auth }}" openstack_blazar_auth: "{{ openstack_auth }}"
#####################
## Kolla
#####################
blazar_git_repository: "{{ kolla_dev_repos_git }}/{{ project_name }}"
blazar_dev_repos_pull: "{{ kolla_dev_repos_pull }}"
blazar_dev_mode: "{{ kolla_dev_mode }}"

4
ansible/roles/blazar/handlers/main.yml
View File

@@ -13,7 +13,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]
@@ -37,7 +37,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]

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

@@ -15,6 +15,6 @@
BOOTSTRAP: BOOTSTRAP:
name: "bootstrap_blazar" name: "bootstrap_blazar"
restart_policy: "never" restart_policy: "never"
volumes: "{{ blazar_api.volumes }}" volumes: "{{ blazar_api.volumes|reject('equalto', '')|list }}"
run_once: True run_once: True
delegate_to: "{{ groups[blazar_api.group][0] }}" delegate_to: "{{ groups[blazar_api.group][0] }}"

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

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

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

@@ -88,7 +88,7 @@
common_options: "{{ docker_common_options }}" common_options: "{{ docker_common_options }}"
name: "{{ item.value.container_name }}" name: "{{ item.value.container_name }}"
image: "{{ item.value.image }}" image: "{{ item.value.image }}"
volumes: "{{ item.value.volumes }}" volumes: "{{ item.value.volumes|reject('equalto', '')|list }}"
register: check_blazar_containers register: check_blazar_containers
when: when:
- kolla_action != "config" - kolla_action != "config"

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

@@ -6,6 +6,9 @@
when: inventory_hostname in groups['blazar-api'] or when: inventory_hostname in groups['blazar-api'] or
inventory_hostname in groups['blazar-manager'] inventory_hostname in groups['blazar-manager']
- include: clone.yml
when: blazar_dev_mode | bool
- include: bootstrap.yml - include: bootstrap.yml
when: inventory_hostname in groups['blazar-api'] when: inventory_hostname in groups['blazar-api']