From 8b292c99bf2123d69828733186506dabbe4e22e9 Mon Sep 17 00:00:00 2001
From: howardlee <lihongweibj@inspur.com>
Date: Wed, 3 Oct 2018 15:30:06 +0800
Subject: [PATCH] Git checkout version support for several projects
Kolla-ansible provides support for the dev mode for some projects
of openstack, but there are still some projects that do not yet
support specific release tag. This patch will implement this function
for these project.
Change-Id: I917b27dd61295b542457a21b240afe2cd4e83e58
---
ansible/roles/freezer/defaults/main.yml | 1 +
ansible/roles/freezer/tasks/clone.yml | 2 ++
ansible/roles/nova/defaults/main.yml | 1 +
ansible/roles/nova/tasks/clone.yml | 1 +
ansible/roles/trove/defaults/main.yml | 1 +
ansible/roles/trove/tasks/clone.yml | 1 +
6 files changed, 7 insertions(+)
diff --git a/ansible/roles/freezer/defaults/main.yml b/ansible/roles/freezer/defaults/main.yml
index 2bf7232816..2c19a7edfe 100644
--- a/ansible/roles/freezer/defaults/main.yml
+++ b/ansible/roles/freezer/defaults/main.yml
@@ -77,3 +77,4 @@ freezer_git_repository: "{{ kolla_dev_repos_git }}/{{ project_name }}"
freezer_api_git_repository: "{{ kolla_dev_repos_git }}/freezer-api"
freezer_dev_repos_pull: "{{ kolla_dev_repos_pull }}"
freezer_dev_mode: "{{ kolla_dev_mode }}"
+freezer_source_version: "{{ kolla_source_version }}"
diff --git a/ansible/roles/freezer/tasks/clone.yml b/ansible/roles/freezer/tasks/clone.yml
index f51504a34c..5e5c4b1f4e 100644
--- a/ansible/roles/freezer/tasks/clone.yml
+++ b/ansible/roles/freezer/tasks/clone.yml
@@ -4,9 +4,11 @@
repo: "{{ freezer_git_repository }}"
dest: "{{ kolla_dev_repos_directory }}/{{ project_name }}"
update: "{{ freezer_dev_repos_pull }}"
+ version: "{{ freezer_source_version }}"
- name: Cloning freezer-api source repository for development
git:
repo: "{{ freezer_api_git_repository }}"
dest: "{{ kolla_dev_repos_directory }}/freezer-api"
update: "{{ freezer_dev_repos_pull }}"
+ version: "{{ freezer_source_version }}"
diff --git a/ansible/roles/nova/defaults/main.yml b/ansible/roles/nova/defaults/main.yml
index 1ab5eb0cfc..c241ff21a5 100644
--- a/ansible/roles/nova/defaults/main.yml
+++ b/ansible/roles/nova/defaults/main.yml
@@ -393,3 +393,4 @@ ovs_bridge: "nsx-managed"
nova_git_repository: "{{ kolla_dev_repos_git }}/{{ project_name }}"
nova_dev_repos_pull: "{{ kolla_dev_repos_pull }}"
nova_dev_mode: "{{ kolla_dev_mode }}"
+nova_source_version: "{{ kolla_source_version }}"
diff --git a/ansible/roles/nova/tasks/clone.yml b/ansible/roles/nova/tasks/clone.yml
index 28dd6faeef..e68f7454af 100644
--- a/ansible/roles/nova/tasks/clone.yml
+++ b/ansible/roles/nova/tasks/clone.yml
@@ -4,3 +4,4 @@
repo: "{{ nova_git_repository }}"
dest: "{{ kolla_dev_repos_directory }}/{{ project_name }}"
update: "{{ nova_dev_repos_pull }}"
+ version: "{{ nova_source_version }}"
diff --git a/ansible/roles/trove/defaults/main.yml b/ansible/roles/trove/defaults/main.yml
index 6dfb89ff73..370d6634b5 100644
--- a/ansible/roles/trove/defaults/main.yml
+++ b/ansible/roles/trove/defaults/main.yml
@@ -102,3 +102,4 @@ openstack_trove_auth: "{{ openstack_auth }}"
trove_git_repository: "{{ kolla_dev_repos_git }}/{{ project_name }}"
trove_dev_repos_pull: "{{ kolla_dev_repos_pull }}"
trove_dev_mode: "{{ kolla_dev_mode }}"
+trove_source_version: "{{ kolla_source_version }}"
diff --git a/ansible/roles/trove/tasks/clone.yml b/ansible/roles/trove/tasks/clone.yml
index 5837eacf25..c025219158 100644
--- a/ansible/roles/trove/tasks/clone.yml
+++ b/ansible/roles/trove/tasks/clone.yml
@@ -4,3 +4,4 @@
repo: "{{ trove_git_repository }}"
dest: "{{ kolla_dev_repos_directory }}/{{ project_name }}"
update: "{{ trove_dev_repos_pull }}"
+ version: "{{ trove_source_version }}"
--
GitLab