diff --git a/ansible/bifrost.yml b/ansible/bifrost.yml index 2adedcc1dab71d94885eb51859014f4f827c0246..ad02f05398fc62627a382ff43443837a02b9a514 100644 --- a/ansible/bifrost.yml +++ b/ansible/bifrost.yml @@ -1,8 +1,4 @@ --- -- import_playbook: detect-release.yml - vars: - detect_release_hosts: bifrost - - name: Apply role bifrost hosts: bifrost roles: diff --git a/ansible/detect-release.yml b/ansible/detect-release.yml deleted file mode 100644 index 406a5449999534be11f7562cd2f5af10f4edac9a..0000000000000000000000000000000000000000 --- a/ansible/detect-release.yml +++ /dev/null @@ -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 diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml index 3db00f6d68aa7c6e5c3dba9115e5453319ca1669..6f411310ad813ac3b9e00bc1da47ddc346b09e93 100644 --- a/ansible/group_vars/all.yml +++ b/ansible/group_vars/all.yml @@ -475,7 +475,7 @@ admin_protocol: "{{ 'https' if kolla_enable_tls_internal | bool else 'http' }}" #################### # OpenStack options #################### -openstack_release: "auto" +openstack_release: "master" openstack_logging_debug: "False" openstack_region_name: "RegionOne" diff --git a/ansible/mariadb_backup.yml b/ansible/mariadb_backup.yml index f3a1218863774791cccf2e5872e7c540051bbd86..008726bd839f527548fefc8789a4d75735af787d 100644 --- a/ansible/mariadb_backup.yml +++ b/ansible/mariadb_backup.yml @@ -1,8 +1,4 @@ --- -- import_playbook: detect-release.yml - vars: - detect_release_hosts: mariadb - - name: Backup MariaDB hosts: mariadb roles: diff --git a/ansible/mariadb_recovery.yml b/ansible/mariadb_recovery.yml index a37bf9d5fc98bf8237cb68b74ed4b25557471050..68b489cebbe8a99dab2de89253462b379981a55a 100644 --- a/ansible/mariadb_recovery.yml +++ b/ansible/mariadb_recovery.yml @@ -1,8 +1,4 @@ --- -- import_playbook: detect-release.yml - vars: - detect_release_hosts: mariadb - - name: Recover mariadb hosts: mariadb roles: diff --git a/ansible/site.yml b/ansible/site.yml index 362890eabeea27d85cee0c3d296ae0da5cc9d436..22ff513bdeb59bc23cd4e88797b7f1dc1181897a 100644 --- a/ansible/site.yml +++ b/ansible/site.yml @@ -91,10 +91,6 @@ - enable_zun_{{ enable_zun | bool }} tags: always -- import_playbook: detect-release.yml - vars: - detect_release_hosts: openstack_release_auto - - name: Apply role prechecks gather_facts: false # Apply only when kolla action is 'precheck'. diff --git a/releasenotes/notes/deprecated-auto-detect-openstack_release-d96b5ae2fc27f5ac.yaml b/releasenotes/notes/deprecated-auto-detect-openstack_release-d96b5ae2fc27f5ac.yaml new file mode 100644 index 0000000000000000000000000000000000000000..f2b80af36385c26d5ae0ab7b7dbfd1fe3de2991a --- /dev/null +++ b/releasenotes/notes/deprecated-auto-detect-openstack_release-d96b5ae2fc27f5ac.yaml @@ -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.