Merge "Add tacker dev mode"

This commit is contained in:
Jenkins 2017-09-26 17:58:28 +00:00 committed by Gerrit Code Review
commit 9e9dcd26c2
3 changed files with 21 additions and 0 deletions

View File

@ -9,6 +9,7 @@ tacker_services:
image: "{{ tacker_server_image_full }}"
volumes:
- "{{ node_config_directory }}/tacker-server/:{{ container_config_directory }}/:ro"
- "{{ kolla_dev_repos_directory ~ '/tacker/tacker:/var/lib/kolla/venv/lib/python2.7/site-packages/tacker' if tacker_dev_mode | bool else '' }}"
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla/"
tacker-conductor:
@ -18,6 +19,7 @@ tacker_services:
image: "{{ tacker_conductor_image_full }}"
volumes:
- "{{ node_config_directory }}/tacker-conductor/:{{ container_config_directory }}/:ro"
- "{{ kolla_dev_repos_directory ~ '/tacker/tacker:/var/lib/kolla/venv/lib/python2.7/site-packages/tacker' if tacker_dev_mode | bool else '' }}"
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla/"
@ -54,3 +56,10 @@ tacker_logging_debug: "{{ openstack_logging_debug }}"
tacker_keystone_user: "tacker"
openstack_tacker_auth: "{{ openstack_auth }}"
###################
# Kolla
####################
tacker_git_repository: "{{ kolla_dev_repos_git }}/{{ project_name }}"
tacker_dev_repos_pull: "{{ kolla_dev_repos_pull }}"
tacker_dev_mode: "{{ kolla_dev_mode }}"

View File

@ -0,0 +1,6 @@
---
- name: Cloning source repositories for development
git:
repo: "{{ tacker_git_repository }}"
dest: "{{ kolla_dev_repos_directory }}/{{ project_name }}"
update: "{{ tacker_dev_repos_pull }}"

View File

@ -6,6 +6,12 @@
when: inventory_hostname in groups['tacker-server'] or
inventory_hostname in groups['tacker-conductor']
- include: clone.yml
when:
- tacker_dev_mode | bool
- inventory_hostname in groups['tacker-server'] or
inventory_hostname in groups['tacker-conductor']
- include: bootstrap.yml
when: inventory_hostname in groups['tacker-server']