Remove the uca option for ceph_pkg_source
Having 'uca' as a valid value for ceph_pkg_source means that we have to maintain the UCA parameters in another repo other than the openstack_hosts role, and it has not been maintained well. This is evidenced by the fact that the current value is set to 'pike', which is very old. To reduce this maintenance burden, we simply remove this option. Change-Id: I78bfd1585804c0261645a8e008a7acef66b5795a
This commit is contained in:
parent
897a76bdd7
commit
706f3b6245
|
@ -35,9 +35,6 @@ ceph_client_package_state: "latest"
|
|||
# adjust items such as Ceph release and regional download mirror can be found
|
||||
# in vars/*.yml
|
||||
#
|
||||
# * uca This option installs Ceph from the Ubuntu Cloud Archive. Additional variables
|
||||
# to adjust items such as the OpenStack/Ceph release can be found in vars/*.yml.
|
||||
#
|
||||
# * distro This options installs Ceph from the operating system's default repository and
|
||||
# unlike the other options does not attempt to manage package keys or add additional
|
||||
# package repositories.
|
||||
|
@ -45,10 +42,6 @@ ceph_pkg_source: ceph
|
|||
ceph_stable_release: luminous
|
||||
ceph_apt_pinned_packages: [{ package: "*", release: "ceph.com", priority: 1001 }]
|
||||
|
||||
# Ubuntu Cloud Archive mirror URL
|
||||
# This is only used if 'uca' is the selected option for ceph_pkg_source
|
||||
uca_apt_repo_url: "http://ubuntu-cloud.archive.canonical.com/ubuntu"
|
||||
|
||||
# Ceph Authentication
|
||||
cephx: true
|
||||
|
||||
|
|
|
@ -0,0 +1,7 @@
|
|||
---
|
||||
deprecations:
|
||||
- |
|
||||
In the ``ceph_client`` role, the only valid values for ``ceph_pkg_source``
|
||||
are now ``ceph`` and ``distro``. For Ubuntu, the Ubuntu Cloud Archive apt
|
||||
source is already setup by the ``openstack_hosts`` role, so there is no
|
||||
need for it to also be setup by the ``ceph_client`` role.
|
|
@ -41,14 +41,6 @@
|
|||
when:
|
||||
- ceph_pkg_source == 'ceph'
|
||||
|
||||
- name: add ubuntu cloud archive key package
|
||||
apt:
|
||||
pkg: ubuntu-cloud-keyring
|
||||
state: "{{ ceph_client_package_state }}"
|
||||
register: add_keys
|
||||
when:
|
||||
- ceph_pkg_source == 'uca'
|
||||
|
||||
# When updating the cache in the apt_repository
|
||||
# task, and the update fails, a retry does not
|
||||
# detect a change the second attempt and therefore
|
||||
|
|
|
@ -31,6 +31,12 @@
|
|||
tags:
|
||||
- always
|
||||
|
||||
- name: Fail if ceph_pkg_source uses an incorrect parameter
|
||||
fail:
|
||||
msg: "Invalid value for ceph_pkg_source. Valid parameters are ceph, distro."
|
||||
when:
|
||||
- ceph_pkg_source not in ['ceph', 'distro']
|
||||
|
||||
- include_tasks: "ceph_preinstall_{{ ansible_pkg_mgr }}.yml"
|
||||
when:
|
||||
- ceph_pkg_source != 'distro'
|
||||
|
|
|
@ -34,9 +34,7 @@ ceph_revoked_gpg_keys:
|
|||
ceph_apt_repo_url_region: "download" # or "eu" for Netherlands based mirror
|
||||
ceph_apt_repo_url: "http://{{ ceph_apt_repo_url_region }}.ceph.com/debian-{{ ceph_stable_release }}/"
|
||||
|
||||
# Ubuntu Cloud Archive variables
|
||||
uca_openstack_release: pike
|
||||
uca_repo_dist: "{{ ansible_lsb.codename }}-updates/{{ uca_openstack_release }}"
|
||||
# LibVirt differentials between Debian and Ubuntu
|
||||
libvirt_package: "{{ (ansible_distribution == 'Debian') | ternary('libvirt-daemon-system', 'libvirt-bin') }}"
|
||||
libvirt_service_name: libvirtd
|
||||
|
||||
|
@ -48,6 +46,3 @@ ceph_apt_repos:
|
|||
ceph:
|
||||
repo: "deb {{ ceph_apt_repo_url }} {{ ansible_lsb.codename }} main"
|
||||
state: "present"
|
||||
uca:
|
||||
repo: "deb {{ uca_apt_repo_url }} {{ uca_repo_dist }} main"
|
||||
state: "present"
|
||||
|
|
Loading…
Reference in New Issue