Use debian OpenStack repos
Debian has their own OpenStack repositories [1] which we should use for delivering modern software and for distro deployments. This patch also renames uca related variable to apt to correspond the needs of these variables. [1] https://wiki.debian.org/OpenStack Change-Id: I7b613d50027a3e55500c5de4823268a290e04ffb
This commit is contained in:
parent
5109d93593
commit
04949ede51
@ -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"
|
||||
|
7
releasenotes/notes/apt_repo-097cb34c12e60207.yaml
Normal file
7
releasenotes/notes/apt_repo-097cb34c12e60207.yaml
Normal file
@ -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.
|
@ -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/
|
||||
|
@ -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/
|
||||
|
@ -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/
|
||||
|
Loading…
Reference in New Issue
Block a user