openstack
/
openstack-ansible-openstack_hosts
Code Issues Proposed changes

Merge "Update distro mirrors to match release"

This commit is contained in:
Zuul 2021-06-10 16:38:35 +00:00 committed by Gerrit Code Review
parent fa9102b9e1 117682cad6
commit fe04707b0b
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
defaults/main.yml
View File

@ -154,8 +154,8 @@ openstack_host_sysstat_cron_mode: '0755'
# NOTE(mhayden): Ensure that the full path to the 'centos' directory is used.
openstack_hosts_centos_mirror_url: 'http://mirror.centos.org/centos'
openstack_hosts_rdo_mirror_url: 'https://trunk.rdoproject.org'
openstack_hosts_rdo_repo_url: "{{ openstack_hosts_rdo_mirror_url }}/centos{{ ansible_facts['distribution_major_version'] }}-master/current-passed-ci/"
openstack_hosts_rdo_deps_url: "{{ openstack_hosts_rdo_mirror_url }}/centos{{ ansible_facts['distribution_major_version'] }}-master/deps/latest/"
openstack_hosts_rdo_repo_url: "{{ _openstack_hosts_rdo_repo_url }}"
openstack_hosts_rdo_deps_url: "{{ _openstack_hosts_rdo_deps_url }}"
openstack_hosts_power_tool_enable: "{{ ('manila_all' in groups or 'gnocchi_all' in groups or install_method | default('source') == 'distro') }}"
# Keep a history of systemd journals on disk after reboots

3
vars/redhat-8.yml
View File

@ -87,6 +87,9 @@ _package_list:
- name: centos-release-storage-common
state: absent
_openstack_hosts_rdo_repo_url: "{{ openstack_hosts_rdo_mirror_url }}/centos{{ ansible_facts['distribution_major_version'] }}-{{ openstack_distrib_code_name | lower }}/current/"
_openstack_hosts_rdo_deps_url: "{{ openstack_hosts_rdo_mirror_url }}/centos{{ ansible_facts['distribution_major_version'] }}-{{ openstack_distrib_code_name | lower }}/deps/latest/"
_package_repos:
- name: rdo-deps
file: rdo-deps

2
vars/ubuntu-20.04.yml
View File

@ -95,6 +95,6 @@ _package_repos: []
# state: present
# filename: "uca"
_uca_repo: "deb {{ apt_repo_url | default('http://ubuntu-cloud.archive.canonical.com/ubuntu') }} {{ ansible_facts['lsb']['codename'] }}-updates/victoria main"
_uca_repo: "deb {{ apt_repo_url | default('http://ubuntu-cloud.archive.canonical.com/ubuntu') }} {{ ansible_facts['lsb']['codename'] }}-updates/{{ openstack_distrib_code_name | lower }} main"
_openstack_host_ca_location: /usr/local/share/ca-certificates/