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 }}"

ansible/roles/heat/tasks/clone.yml

@@ -4,3 +4,4 @@
     repo: "{{ heat_git_repository }}"
     dest: "{{ kolla_dev_repos_directory }}/{{ project_name }}"
     update: "{{ heat_dev_repos_pull }}"
+    version: "{{ heat_source_version }}"

ansible/roles/horizon/defaults/main.yml

@@ -78,3 +78,5 @@ murano_dashboard_git_repository: "{{ kolla_dev_repos_git }}/murano-dashboard"
 horizon_dev_repos_pull: "{{ kolla_dev_repos_pull }}"
 horizon_dev_mode: "{{ kolla_dev_mode }}"
 horizon_murano_dev_mode: "{{ kolla_dev_mode }}"
+horizon_source_version: "{{ kolla_source_version }}"
+horizon_murano_source_version: "{{ kolla_source_version }}"

ansible/roles/horizon/tasks/clone.yml

@@ -4,11 +4,13 @@
     repo: "{{ horizon_git_repository }}"
     dest: "{{ kolla_dev_repos_directory }}/{{ project_name }}"
     update: "{{ horizon_dev_repos_pull }}"
+    version: "{{ horizon_source_version }}"
 
 - name: Cloning murano-dashboard source repositories for development
   git:
     repo: "{{ murano_dashboard_git_repository }}"
     dest: "{{ kolla_dev_repos_directory }}/murano-dashboard"
     update: "{{ horizon_dev_repos_pull }}"
+    version: "{{ horizon_murano_source_version }}"
   when:
     - horizon_murano_dev_mode | bool

ansible/roles/ironic/defaults/main.yml

@@ -166,3 +166,4 @@ ironic_inspector_git_repository: "{{ kolla_dev_repos_git }}/ironic-inspector"
 ironic_git_repository: "{{ kolla_dev_repos_git }}/{{ project_name }}"
 ironic_dev_repos_pull: "{{ kolla_dev_repos_pull }}"
 ironic_dev_mode: "{{ kolla_dev_mode }}"
+ironic_source_version: "{{ kolla_source_version }}"

ansible/roles/ironic/tasks/clone.yml

@@ -4,9 +4,11 @@
     repo: "{{ ironic_git_repository }}"
     dest: "{{ kolla_dev_repos_directory }}/{{ project_name }}"
     update: "{{ ironic_dev_repos_pull }}"
+    version: "{{ ironic_source_version }}"
 
 - name: Cloning ironic-inspector source repository for development
   git:
     repo: "{{ ironic_inspector_git_repository }}"
     dest: "{{ kolla_dev_repos_directory }}/ironic-inspector"
     update: "{{ ironic_dev_repos_pull }}"
+    version: "{{ ironic_source_version }}"

ansible/roles/keystone/defaults/main.yml

@@ -89,3 +89,4 @@ openstack_keystone_auth: "{{ openstack_auth }}"
 keystone_git_repository: "{{ kolla_dev_repos_git }}/{{ project_name }}"
 keystone_dev_repos_pull: "{{ kolla_dev_repos_pull }}"
 keystone_dev_mode: "{{ kolla_dev_mode }}"
+keystone_source_version: "{{ kolla_source_version }}"

ansible/roles/keystone/tasks/clone.yml

@@ -4,3 +4,4 @@
     repo: "{{ keystone_git_repository }}"
     dest: "{{ kolla_dev_repos_directory }}/{{ project_name }}"
     update: "{{ keystone_dev_repos_pull }}"
+    version: "{{ keystone_source_version }}"

ansible/roles/kuryr/defaults/main.yml

@@ -55,3 +55,4 @@ kuryr_libnetwork_git_repository: "{{ kolla_dev_repos_git }}/{{ libnetwork_projec
 kuryr_dev_repos_pull: "{{ kolla_dev_repos_pull }}"
 kuryr_dev_mode: "{{ kolla_dev_mode }}"
 kuryr_dimensions: "{{ default_container_dimensions }}"
+kuryr_source_version: "{{ kolla_source_version }}"

ansible/roles/kuryr/tasks/clone.yml

@@ -4,9 +4,11 @@
     repo: "{{ kuryr_git_repository }}"
     dest: "{{ kolla_dev_repos_directory }}/{{ project_name }}"
     update: "{{ kuryr_dev_repos_pull }}"
+    version: "{{ kuryr_source_version }}"
 
 - name: Cloning kuryr-libnetwork source repository for development
   git:
     repo: "{{ kuryr_libnetwork_git_repository }}"
     dest: "{{ kolla_dev_repos_directory }}/{{ libnetwork_project_name }}"
     update: "{{ kuryr_dev_repos_pull }}"
+    version: "{{ kuryr_source_version }}"

ansible/roles/magnum/defaults/main.yml

@@ -87,3 +87,4 @@ openstack_magnum_auth: "{{ openstack_auth }}"
 magnum_git_repository: "{{ kolla_dev_repos_git }}/{{ project_name }}"
 magnum_dev_repos_pull: "{{ kolla_dev_repos_pull }}"
 magnum_dev_mode: "{{ kolla_dev_mode }}"
+magnum_source_version: "{{ kolla_source_version }}"

ansible/roles/magnum/tasks/clone.yml

@@ -4,3 +4,4 @@
     repo: "{{ magnum_git_repository }}"
     dest: "{{ kolla_dev_repos_directory }}/{{ project_name }}"
     update: "{{ magnum_dev_repos_pull }}"
+    version: "{{ magnum_source_version }}"

ansible/roles/manila/defaults/main.yml

@@ -159,3 +159,4 @@ manila_enabled_backends: "{{ manila_backends|selectattr('enabled', 'equalto', tr
 manila_git_repository: "{{ kolla_dev_repos_git }}/{{ project_name }}"
 manila_dev_repos_pull: "{{ kolla_dev_repos_pull }}"
 manila_dev_mode: "{{ kolla_dev_mode }}"
+manila_source_version: "{{ kolla_source_version }}"

ansible/roles/manila/tasks/clone.yml

@@ -4,3 +4,4 @@
     repo: "{{ manila_git_repository }}"
     dest: "{{ kolla_dev_repos_directory }}/{{ project_name }}"
     update: "{{ manila_dev_repos_pull }}"
+    version: "{{ manila_source_version }}"

ansible/roles/mistral/defaults/main.yml

@@ -87,3 +87,4 @@ openstack_mistral_auth: "{{ openstack_auth }}"
 mistral_git_repository: "{{ kolla_dev_repos_git }}/{{ project_name }}"
 mistral_dev_repos_pull: "{{ kolla_dev_repos_pull }}"
 mistral_dev_mode: "{{ kolla_dev_mode }}"
+mistral_source_version: "{{ kolla_source_version }}"

ansible/roles/mistral/tasks/clone.yml

@@ -4,3 +4,4 @@
     repo: "{{ mistral_git_repository }}"
     dest: "{{ kolla_dev_repos_directory }}/{{ project_name }}"
     update: "{{ mistral_dev_repos_pull }}"
+    version: "{{ mistral_source_version }}"

ansible/roles/murano/defaults/main.yml

@@ -71,3 +71,4 @@ murano_agent_timeout: 3600
 murano_git_repository: "{{ kolla_dev_repos_git }}/{{ project_name }}"
 murano_dev_repos_pull: "{{ kolla_dev_repos_pull }}"
 murano_dev_mode: "{{ kolla_dev_mode }}"
+murano_source_version: "{{ kolla_source_version }}"

ansible/roles/murano/tasks/clone.yml

@@ -4,3 +4,4 @@
     repo: "{{ murano_git_repository }}"
     dest: "{{ kolla_dev_repos_directory }}/{{ project_name }}"
     update: "{{ murano_dev_repos_pull }}"
+    version: "{{ murano_source_version }}"

ansible/roles/sahara/defaults/main.yml

@@ -75,3 +75,4 @@ openstack_sahara_auth: "{{ openstack_auth }}"
 sahara_git_repository: "{{ kolla_dev_repos_git }}/{{ project_name }}"
 sahara_dev_repos_pull: "{{ kolla_dev_repos_pull }}"
 sahara_dev_mode: "{{ kolla_dev_mode }}"
+sahara_source_version: "{{ kolla_source_version }}"

ansible/roles/sahara/tasks/clone.yml

@@ -4,3 +4,4 @@
     repo: "{{ sahara_git_repository }}"
     dest: "{{ kolla_dev_repos_directory }}/{{ project_name }}"
     update: "{{ sahara_dev_repos_pull }}"
+    version: "{{ sahara_source_version }}"

ansible/roles/senlin/defaults/main.yml

@@ -71,3 +71,4 @@ openstack_senlin_auth: "{{ openstack_auth }}"
 senlin_git_repository: "{{ kolla_dev_repos_git }}/{{ project_name }}"
 senlin_dev_repos_pull: "{{ kolla_dev_repos_pull }}"
 senlin_dev_mode: "{{ kolla_dev_mode }}"
+senlin_source_version: "{{ kolla_source_version }}"

ansible/roles/senlin/tasks/clone.yml

@@ -4,3 +4,4 @@
     repo: "{{ senlin_git_repository }}"
     dest: "{{ kolla_dev_repos_directory }}/{{ project_name }}"
     update: "{{ senlin_dev_repos_pull }}"
+    version: "{{ senlin_source_version }}"

ansible/roles/solum/defaults/main.yml

@@ -107,3 +107,4 @@ openstack_solum_auth: "{{ openstack_auth }}"
 solum_git_repository: "{{ kolla_dev_repos_git }}/{{ project_name }}"
 solum_dev_repos_pull: "{{ kolla_dev_repos_pull }}"
 solum_dev_mode: "{{ kolla_dev_mode }}"
+solum_source_version: "{{ kolla_source_version }}"

ansible/roles/solum/tasks/clone.yml

@@ -4,3 +4,4 @@
     repo: "{{ solum_git_repository }}"
     dest: "{{ kolla_dev_repos_directory }}/{{ project_name }}"
     update: "{{ solum_dev_repos_pull }}"
+    version: "{{ solum_source_version }}"

ansible/roles/tacker/defaults/main.yml

@@ -68,3 +68,4 @@ openstack_tacker_auth: "{{ openstack_auth }}"
 tacker_git_repository: "{{ kolla_dev_repos_git }}/{{ project_name }}"
 tacker_dev_repos_pull: "{{ kolla_dev_repos_pull }}"
 tacker_dev_mode: "{{ kolla_dev_mode }}"
+tacker_source_version: "{{ kolla_source_version }}"

ansible/roles/tacker/tasks/clone.yml

@@ -4,3 +4,4 @@
     repo: "{{ tacker_git_repository }}"
     dest: "{{ kolla_dev_repos_directory }}/{{ project_name }}"
     update: "{{ tacker_dev_repos_pull }}"
+    version: "{{ tacker_source_version }}"

ansible/roles/vitrage/defaults/main.yml

@@ -151,3 +151,4 @@ vitrage_datasources: "{{ vitrage_datasource | selectattr('enabled', 'equalto', t
 vitrage_git_repository: "{{ kolla_dev_repos_git }}/{{ project_name }}"
 vitrage_dev_repos_pull: "{{ kolla_dev_repos_pull }}"
 vitrage_dev_mode: "{{ kolla_dev_mode }}"
+vitrage_source_version: "{{ kolla_source_version }}"

ansible/roles/vitrage/tasks/clone.yml

@@ -4,3 +4,4 @@
     repo: "{{ vitrage_git_repository }}"
     dest: "{{ kolla_dev_repos_directory }}/{{ project_name }}"
     update: "{{ vitrage_dev_repos_pull }}"
+    version: "{{ vitrage_source_version }}"

ansible/roles/watcher/defaults/main.yml

@@ -87,3 +87,4 @@ openstack_watcher_auth: "{{ openstack_auth }}"
 watcher_git_repository: "{{ kolla_dev_repos_git }}/{{ project_name }}"
 watcher_dev_repos_pull: "{{ kolla_dev_repos_pull }}"
 watcher_dev_mode: "{{ kolla_dev_mode }}"
+watcher_source_version: "{{ kolla_source_version }}"

ansible/roles/watcher/tasks/clone.yml

@@ -4,3 +4,4 @@
     repo: "{{ watcher_git_repository }}"
     dest: "{{ kolla_dev_repos_directory }}/{{ project_name }}"
     update: "{{ watcher_dev_repos_pull }}"
+    version: "{{ watcher_source_version }}"

ansible/roles/zun/defaults/main.yml

@@ -90,3 +90,4 @@ openstack_zun_auth: "{{ openstack_auth }}"
 zun_git_repository: "{{ kolla_dev_repos_git }}/{{ project_name }}"
 zun_dev_repos_pull: "{{ kolla_dev_repos_pull }}"
 zun_dev_mode: "{{ kolla_dev_mode }}"
+zun_source_version: "{{ kolla_source_version }}"

ansible/roles/zun/tasks/clone.yml

@@ -4,3 +4,4 @@
     repo: "{{ zun_git_repository }}"
     dest: "{{ kolla_dev_repos_directory }}/{{ project_name }}"
     update: "{{ zun_dev_repos_pull }}"
+    version: "{{ zun_source_version }}"