Merge "Support checkout dedicated version from git with dev mode"

ansible/group_vars/all.yml

@@ -49,6 +49,7 @@ kolla_dev_repos_directory: "/opt/stack/"
 kolla_dev_repos_git: "https://git.openstack.org/openstack"
 kolla_dev_repos_pull: "no"
 kolla_dev_mode: "no"
+kolla_source_version: "master"
 
 # Proxy settings for containers such as magnum that need internet access
 container_http_proxy: ""

ansible/roles/aodh/defaults/main.yml

@@ -103,3 +103,4 @@ openstack_aodh_auth: "{{ openstack_auth }}"
 aodh_git_repository: "{{ kolla_dev_repos_git }}/{{ project_name }}"
 aodh_dev_repos_pull: "{{ kolla_dev_repos_pull }}"
 aodh_dev_mode: "{{ kolla_dev_mode }}"
+aodh_source_version: "{{ kolla_source_version }}"

ansible/roles/aodh/tasks/clone.yml

@@ -4,3 +4,4 @@
     repo: "{{ aodh_git_repository }}"
     dest: "{{ kolla_dev_repos_directory }}/{{ project_name }}"
     update: "{{ aodh_dev_repos_pull }}"
+    version: "{{ aodh_source_version }}"

ansible/roles/barbican/defaults/main.yml

@@ -92,3 +92,4 @@ openstack_barbican_auth: "{{ openstack_auth }}"
 barbican_git_repository: "{{ kolla_dev_repos_git }}/{{ project_name }}"
 barbican_dev_repos_pull: "{{ kolla_dev_repos_pull }}"
 barbican_dev_mode: "{{ kolla_dev_mode }}"
+barbican_source_version: "{{ kolla_source_version }}"

ansible/roles/barbican/tasks/clone.yml

@@ -4,3 +4,4 @@
     repo: "{{ barbican_git_repository }}"
     dest: "{{ kolla_dev_repos_directory }}/{{ project_name }}"
     update: "{{ barbican_dev_repos_pull }}"
+    version: "{{ barbican_source_version }}"

ansible/roles/blazar/defaults/main.yml

@@ -76,3 +76,4 @@ openstack_blazar_auth: "{{ openstack_auth }}"
 blazar_git_repository: "{{ kolla_dev_repos_git }}/{{ project_name }}"
 blazar_dev_repos_pull: "{{ kolla_dev_repos_pull }}"
 blazar_dev_mode: "{{ kolla_dev_mode }}"
+blazar_source_version: "{{ kolla_source_version }}"

ansible/roles/blazar/tasks/clone.yml

@@ -4,3 +4,4 @@
     repo: "{{ blazar_git_repository }}"
     dest: "{{ kolla_dev_repos_directory }}/{{ project_name }}"
     update: "{{ blazar_dev_repos_pull }}"
+    version: "{{ blazar_source_version }}"

ansible/roles/ceilometer/defaults/main.yml

@@ -80,3 +80,4 @@ openstack_ceilometer_auth: "{{ openstack_auth }}"
 ceilometer_git_repository: "{{ kolla_dev_repos_git }}/{{ project_name }}"
 ceilometer_dev_repos_pull: "{{ kolla_dev_repos_pull }}"
 ceilometer_dev_mode: "{{ kolla_dev_mode }}"
+ceilometer_source_version: "{{ kolla_source_version }}"

ansible/roles/ceilometer/tasks/clone.yml

@@ -4,3 +4,4 @@
     repo: "{{ ceilometer_git_repository }}"
     dest: "{{ kolla_dev_repos_directory }}/{{ project_name }}"
     update: "{{ ceilometer_dev_repos_pull }}"
+    version: "{{ ceilometer_source_version }}"

ansible/roles/cinder/defaults/main.yml

@@ -217,3 +217,4 @@ zfssa_iscsi_target_interfaces:
 cinder_git_repository: "{{ kolla_dev_repos_git }}/{{ project_name }}"
 cinder_dev_repos_pull: "{{ kolla_dev_repos_pull }}"
 cinder_dev_mode: "{{ kolla_dev_mode }}"
+cinder_source_version: "{{ kolla_source_version }}"

ansible/roles/cinder/tasks/clone.yml

@@ -4,3 +4,4 @@
     repo: "{{ cinder_git_repository }}"
     dest: "{{ kolla_dev_repos_directory }}/{{ project_name }}"
     update: "{{ cinder_dev_repos_pull }}"
+    version: "{{ cinder_source_version }}"

ansible/roles/cloudkitty/defaults/main.yml

@@ -78,3 +78,4 @@ cloudkitty_openstack_keystone_default_role: "rating"
 cloudkitty_git_repository: "{{ kolla_dev_repos_git }}/{{ project_name }}"
 cloudkitty_dev_repos_pull: "{{ kolla_dev_repos_pull }}"
 cloudkitty_dev_mode: "{{ kolla_dev_mode }}"
+cloudkitty_source_version: "{{ kolla_source_version }}"

ansible/roles/cloudkitty/tasks/clone.yml

@@ -4,3 +4,4 @@
     repo: "{{ cloudkitty_git_repository }}"
     dest: "{{ kolla_dev_repos_directory }}/{{ project_name }}"
     update: "{{ cloudkitty_dev_repos_pull }}"
+    version: "{{ cloudkitty_source_version }}"

ansible/roles/congress/defaults/main.yml

@@ -87,3 +87,4 @@ openstack_congress_auth: "{{ openstack_auth }}"
 congress_git_repository: "{{ kolla_dev_repos_git }}/{{ project_name }}"
 congress_dev_repos_pull: "{{ kolla_dev_repos_pull }}"
 congress_dev_mode: "{{ kolla_dev_mode }}"
+congress_source_version: "{{ kolla_source_version }}"

ansible/roles/congress/tasks/clone.yml

@@ -4,3 +4,4 @@
     repo: "{{ congress_git_repository }}"
     dest: "{{ kolla_dev_repos_directory }}/{{ project_name }}"
     update: "{{ congress_dev_repos_pull }}"
+    version: "{{ congress_source_version }}"

ansible/roles/designate/defaults/main.yml

@@ -155,6 +155,7 @@ openstack_designate_auth: "{{ openstack_auth }}"
 designate_git_repository: "{{ kolla_dev_repos_git }}/{{ project_name }}"
 designate_dev_repos_pull: "{{ kolla_dev_repos_pull }}"
 designate_dev_mode: "{{ kolla_dev_mode }}"
+designate_source_version: "{{ kolla_source_version }}"
 
 ####################
 ## Designate

ansible/roles/designate/tasks/clone.yml

@@ -4,3 +4,4 @@
     repo: "{{ designate_git_repository }}"
     dest: "{{ kolla_dev_repos_directory }}/{{ project_name }}"
     update: "{{ designate_dev_repos_pull }}"
+    version: "{{ designate_source_version }}"

ansible/roles/glance/defaults/main.yml

@@ -124,6 +124,7 @@ openstack_glance_auth: "{{ openstack_auth }}"
 glance_git_repository: "{{ kolla_dev_repos_git }}/{{ project_name }}"
 glance_dev_repos_pull: "{{ kolla_dev_repos_pull }}"
 glance_dev_mode: "{{ kolla_dev_mode }}"
+glance_source_version: "{{ kolla_source_version }}"
 
 ################################################
 # VMware - OpenStack VMware support

ansible/roles/glance/tasks/clone.yml

@@ -4,3 +4,4 @@
     repo: "{{ glance_git_repository }}"
     dest: "{{ kolla_dev_repos_directory }}/{{ project_name }}"
     update: "{{ glance_dev_repos_pull }}"
+    version: "{{ glance_source_version }}"

ansible/roles/heat/defaults/main.yml

@@ -92,3 +92,4 @@ openstack_heat_auth: "{{ openstack_auth }}"
 heat_git_repository: "{{ kolla_dev_repos_git }}/{{ project_name }}"
 heat_dev_repos_pull: "{{ kolla_dev_repos_pull }}"
 heat_dev_mode: "{{ kolla_dev_mode }}"
+heat_source_version: "{{ kolla_source_version }}"