From 9e69d33c3f3448d34ab23c9fcecacce457a545ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rados=C5=82aw=20Piliszek?= <radoslaw.piliszek@gmail.com>
Date: Sun, 24 May 2020 10:02:59 +0200
Subject: [PATCH] Make openstack_release more obvious
This is forwardport of [1].
[1] https://review.opendev.org/730496
Change-Id: I6523b915e0231c28b5cd91f821515f3d47309d66
---
ansible/group_vars/all.yml | 2 +-
etc/kolla/globals.yml | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml
index b4ef05a7a..8ec048c2d 100644
--- a/ansible/group_vars/all.yml
+++ b/ansible/group_vars/all.yml
@@ -50,7 +50,7 @@ kolla_dev_repos_directory: "/opt/stack/"
kolla_dev_repos_git: "https://opendev.org/openstack"
kolla_dev_repos_pull: "no"
kolla_dev_mode: "no"
-kolla_source_version: "master"
+kolla_source_version: "{{ openstack_release }}"
# Proxy settings for containers such as magnum that need internet access
container_http_proxy: ""
diff --git a/etc/kolla/globals.yml b/etc/kolla/globals.yml
index e79c03cce..7bc372de8 100644
--- a/etc/kolla/globals.yml
+++ b/etc/kolla/globals.yml
@@ -17,8 +17,8 @@
# Valid options are [ binary, source ]
#kolla_install_type: "binary"
-# Valid option is Docker repository tag
-#openstack_release: ""
+# Do not override this unless you know what you are doing.
+#openstack_release: "master"
# Docker image tag used by default.
#openstack_tag: "{{ openstack_release ~ openstack_tag_suffix }}"
--
GitLab