diff --git a/defaults/main.yml b/defaults/main.yml index 8003b702..7087d45e 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -151,8 +151,6 @@ 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 }}/centos7-master/current-passed-ci/" openstack_hosts_rdo_deps_url: "{{ openstack_hosts_rdo_mirror_url }}/centos7-master/deps/latest/" -# Ubuntu cloud archive data -uca_repo: "{{ _uca_repo }}" # Default opensuse mirrors URLs opensuse_mirror: "http://download.opensuse.org" diff --git a/releasenotes/notes/apt_repo-097cb34c12e60207.yaml b/releasenotes/notes/apt_repo-097cb34c12e60207.yaml new file mode 100644 index 00000000..5672a462 --- /dev/null +++ b/releasenotes/notes/apt_repo-097cb34c12e60207.yaml @@ -0,0 +1,7 @@ +--- +upgrade: + - | + Variable `uca_repo` has been removed. Deployers are appreciated to use + `user_external_repos_list` instead if they want to define extra repository + Variable `uca_apt_repo_url` was renamed to `apt_repo_url` in order + to correspond it's usage as it also affect Debian deployments now. diff --git a/vars/debian.yml b/vars/debian.yml index a4785832..48a7c0e9 100644 --- a/vars/debian.yml +++ b/vars/debian.yml @@ -77,8 +77,19 @@ _openstack_host_metal_distro_packages: - vlan - wget -_package_repos_keys: [] +_package_repos_keys: + - id: 0FB8E8DD19498FEC90B25E5E56056AB2FEE4EECB + url: "http://osbpo.debian.net/osbpo/dists/pubkey.gpg" + state: present + _package_list: [] -_package_repos: [] + +_package_repos: + - repo: "deb {{ apt_repo_url | default('http://osbpo.debian.net/osbpo/ ' ~ ansible_distribution_release ~ '-train-backports main') }}" + state: present + filename: "osbpo" + - repo: "deb {{ apt_repo_url | default('http://osbpo.debian.net/osbpo/ ' ~ ansible_distribution_release ~ '-train-backports-nochange main') }}" + state: present + filename: "osbpo" _openstack_host_ca_location: /usr/local/share/ca-certificates/ diff --git a/vars/ubuntu-16.04.yml b/vars/ubuntu-16.04.yml index 3584690d..5857c3f7 100644 --- a/vars/ubuntu-16.04.yml +++ b/vars/ubuntu-16.04.yml @@ -90,10 +90,8 @@ _package_list: _package_repos: # Implement the current UCA repo configuration - - repo: "{{ uca_repo }}" + - repo: "deb {{ apt_repo_url | default('http://ubuntu-cloud.archive.canonical.com/ubuntu') }} {{ ansible_lsb.codename }}-updates/queens main" state: present filename: "uca" -_uca_repo: "deb {{ uca_apt_repo_url | default('http://ubuntu-cloud.archive.canonical.com/ubuntu') }} {{ ansible_lsb.codename }}-updates/queens main" - _openstack_host_ca_location: /usr/local/share/ca-certificates/ diff --git a/vars/ubuntu-18.04.yml b/vars/ubuntu-18.04.yml index 2d303ead..d120298b 100644 --- a/vars/ubuntu-18.04.yml +++ b/vars/ubuntu-18.04.yml @@ -92,10 +92,8 @@ _package_list: _package_repos: # Implement the current UCA repo configuration - - repo: "{{ uca_repo }}" + - repo: "deb {{ apt_repo_url | default('http://ubuntu-cloud.archive.canonical.com/ubuntu') }} {{ ansible_lsb.codename }}-updates/ussuri main" state: present filename: "uca" -_uca_repo: "deb {{ uca_apt_repo_url | default('http://ubuntu-cloud.archive.canonical.com/ubuntu') }} {{ ansible_lsb.codename }}-updates/ussuri main" - _openstack_host_ca_location: /usr/local/share/ca-certificates/