Merge "Add dev mode for Murano"

This commit is contained in:
Jenkins 2017-07-20 11:27:51 +00:00 committed by Gerrit Code Review
commit 6ef30ca452
4 changed files with 22 additions and 0 deletions

View File

@ -36,3 +36,11 @@ murano_logging_debug: "{{ openstack_logging_debug }}"
murano_keystone_user: "murano"
openstack_murano_auth: "{{ openstack_auth }}"
####################
# Kolla
####################
murano_git_repository: "{{ kolla_dev_repos_git }}/{{ project_name }}"
murano_dev_repos_pull: "{{ kolla_dev_repos_pull }}"
murano_dev_mode: "{{ kolla_dev_mode }}"

View File

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

View File

@ -6,6 +6,12 @@
when: inventory_hostname in groups['murano-api'] or
inventory_hostname in groups['murano-engine']
- include: clone.yml
when:
- murano_dev_mode | bool
- inventory_hostname in groups['murano-api'] or
inventory_hostname in groups['murano-engine']
- include: bootstrap.yml
when: inventory_hostname in groups['murano-api']

View File

@ -7,6 +7,7 @@
name: "murano_engine"
volumes:
- "{{ node_config_directory }}/murano-engine/:{{ container_config_directory }}/:ro"
- "{{ kolla_dev_repos_directory ~ '/murano/murano:/var/lib/kolla/venv/lib/python2.7/site-packages/murano' if murano_dev_mode | bool else '' }}"
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla/"
when: inventory_hostname in groups['murano-engine']
@ -19,6 +20,7 @@
name: "murano_api"
volumes:
- "{{ node_config_directory }}/murano-api/:{{ container_config_directory }}/:ro"
- "{{ kolla_dev_repos_directory ~ '/murano/murano:/var/lib/kolla/venv/lib/python2.7/site-packages/murano' if murano_dev_mode | bool else '' }}"
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla/"
when: inventory_hostname in groups['murano-api']