Merge "Add dev mode for glance"

This commit is contained in:
Jenkins 2017-09-26 15:43:02 +00:00 committed by Gerrit Code Review
commit 9840f5c39d
4 changed files with 24 additions and 0 deletions

View File

@ -11,6 +11,7 @@ glance_services:
- "{{ node_config_directory }}/glance-api/:{{ container_config_directory }}/:ro" - "{{ node_config_directory }}/glance-api/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro" - "/etc/localtime:/etc/localtime:ro"
- "{{ glance_file_datadir_volume }}:/var/lib/glance/" - "{{ glance_file_datadir_volume }}:/var/lib/glance/"
- "{{ kolla_dev_repos_directory ~ '/glance/glance:/var/lib/kolla/venv/lib/python2.7/site-packages/glance' if glance_dev_mode | bool else '' }}"
- "kolla_logs:/var/log/kolla/" - "kolla_logs:/var/log/kolla/"
glance-registry: glance-registry:
container_name: glance_registry container_name: glance_registry
@ -94,6 +95,13 @@ glance_keystone_user: "glance"
openstack_glance_auth: "{{ openstack_auth }}" openstack_glance_auth: "{{ openstack_auth }}"
###################
# Kolla
####################
glance_git_repository: "{{ kolla_dev_repos_git }}/{{ project_name }}"
glance_dev_repos_pull: "{{ kolla_dev_repos_pull }}"
glance_dev_mode: "{{ kolla_dev_mode }}"
################################################ ################################################
# VMware - OpenStack VMware support # VMware - OpenStack VMware support
################################################ ################################################

View File

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

View File

@ -19,6 +19,12 @@
when: inventory_hostname in groups['glance-api'] or when: inventory_hostname in groups['glance-api'] or
inventory_hostname in groups['glance-registry'] inventory_hostname in groups['glance-registry']
- include: clone.yml
when:
- glance_dev_mode | bool
- inventory_hostname in groups['glance-api'] or
inventory_hostname in groups['glance-registry']
- include: bootstrap.yml - include: bootstrap.yml
when: inventory_hostname in groups['glance-api'] when: inventory_hostname in groups['glance-api']

View File

@ -0,0 +1,4 @@
---
features:
- |
Glance can now be developed on using Kolla 'dev mode'.