Update "openstack_release" variable to static brach name

Since we use the release name as the default tag to publish images
to Dockerhub, we should use this by default.

This change also removes support for the magic value "auto".

Change-Id: I5610cc7729e9311709147ba5532199a033dfd156
Closes-Bug: #1843518
This commit is contained in:
chenxing 2019-09-12 09:25:05 +08:00 committed by Mark Goddard
parent 15ce0e0600
commit 4eceb48d2d
7 changed files with 8 additions and 33 deletions

View File

@ -1,8 +1,4 @@
--- ---
- import_playbook: detect-release.yml
vars:
detect_release_hosts: bifrost
- name: Apply role bifrost - name: Apply role bifrost
hosts: bifrost hosts: bifrost
roles: roles:

View File

@ -1,16 +0,0 @@
---
- name: Detect openstack_release variable
hosts: "{{ detect_release_hosts }}"
gather_facts: false
tasks:
- name: Get current kolla-ansible version number
local_action: command python -c "import pbr.version; print(pbr.version.VersionInfo('kolla-ansible'))"
register: kolla_ansible_version
changed_when: false
when: openstack_release == "auto"
- name: Set openstack_release variable
set_fact:
openstack_release: "{{ kolla_ansible_version.stdout }}"
when: openstack_release == "auto"
tags: always

View File

@ -474,7 +474,7 @@ admin_protocol: "http"
#################### ####################
# OpenStack options # OpenStack options
#################### ####################
openstack_release: "auto" openstack_release: "master"
openstack_logging_debug: "False" openstack_logging_debug: "False"
openstack_region_name: "RegionOne" openstack_region_name: "RegionOne"

View File

@ -1,8 +1,4 @@
--- ---
- import_playbook: detect-release.yml
vars:
detect_release_hosts: mariadb
- name: Backup MariaDB - name: Backup MariaDB
hosts: mariadb hosts: mariadb
roles: roles:

View File

@ -1,8 +1,4 @@
--- ---
- import_playbook: detect-release.yml
vars:
detect_release_hosts: mariadb
- name: Recover mariadb - name: Recover mariadb
hosts: mariadb hosts: mariadb
roles: roles:

View File

@ -91,10 +91,6 @@
- enable_zun_{{ enable_zun | bool }} - enable_zun_{{ enable_zun | bool }}
tags: always tags: always
- import_playbook: detect-release.yml
vars:
detect_release_hosts: openstack_release_auto
- name: Apply role prechecks - name: Apply role prechecks
gather_facts: false gather_facts: false
# Apply only when kolla action is 'precheck'. # Apply only when kolla action is 'precheck'.

View File

@ -0,0 +1,7 @@
---
upgrade:
- |
Modifies the default value for ``openstack_release`` from ``auto``
to the name of the release (e.g. ``train``), or ``master`` on the
master branch. The value of ``auto`` will no longer detect the
version of the ``kolla-ansible`` Python package.