Adapt the list of ceph packages for SUSE

SUSE needs more than one distro package for rados support. If
they aren't installed, issues like this [1] appear.

Sadly, the current variable expects only one package name,
and not a list of packages.

This change does the minimum job to make it work, simply
renaming the internal variable (renaming package with
packageS) for readability purposes, and using this new
variable as a list in the provided ``vars/main.yml``.

[1]: http://logs.openstack.org/periodic/git.openstack.org/openstack/openstack-ansible/master/openstack-ansible-deploy-ceph-opensuse-423/266bcd0/job-output.txt.gz#_2018-04-08_07_27_36_061674

Change-Id: I4bb8bb3bc5840fa1d5159ceb91acea83bd5efce4
This commit is contained in:
Jean-Philippe Evrard 2018-04-09 12:11:21 +02:00
parent 89208ea9ab
commit cf55b9b066
6 changed files with 21 additions and 17 deletions

View File

@ -153,8 +153,7 @@ configurations need to be added to the user variable file:
ceph_extra_components:
- component: gnocchi_api
package:
- "{{ python_ceph_package }}"
package: "{{ python_ceph_packages }}"
client:
- '{{ gnocchi_ceph_client }}'
service: '{{ ceph_gnocchi_service_names }}'

View File

@ -0,0 +1,8 @@
---
other:
- |
The internal variable ``python_ceph_package`` has been renamed to
``python_ceph_packages`` and is now a list instead of a string.
If you are using gnocchi with ceph and are using this internal
variable in your ``ceph_extra_components`` overrides,
please update it to ``python_ceph_packages``.

View File

@ -18,30 +18,22 @@
ceph_components:
- component: glance_api
package:
- "{{ python_ceph_package }}"
package: "{{ python_ceph_packages }}"
client:
- '{{ glance_ceph_client }}'
service: '{{ ceph_glance_service_names }}'
- component: cinder_volume
package:
- ceph-common
- "{{ python_ceph_package }}"
package: "{{ [ 'ceph-common' ] + python_ceph_packages }}"
client:
- '{{ cinder_ceph_client }}'
service: '{{ ceph_cinder_service_names }}'
- component: cinder_backup
package:
- ceph-common
- "{{ python_ceph_package }}"
package: "{{ [ 'ceph-common' ] + python_ceph_packages }}"
client:
- '{{ cinder_backup_ceph_client }}'
service: '{{ ceph_cinder_service_names }}'
- component: nova_compute
package:
- "{{ libvirt_package }}"
- ceph-common
- "{{ python_ceph_package }}"
package: "{{ [ libvirt_package, 'ceph-common' ] + python_ceph_packages }}"
client:
- '{{ nova_ceph_client }}'
service: '{{ ceph_nova_service_names }}'

View File

@ -19,7 +19,8 @@ ceph_gpg_keys: 'https://download.ceph.com/keys/release.asc'
libvirt_package: libvirt-daemon-kvm
libvirt_service_name: libvirtd
python_ceph_package: python-ceph
python_ceph_packages:
- python-ceph
ceph_repo_url_region: "download" # see here for other mirros http://docs.ceph.com/docs/master/install/mirrors/
ceph_yum_repo_url: "https://{{ ceph_repo_url_region }}.ceph.com/rpm-{{ ceph_stable_release }}/el7"

View File

@ -16,7 +16,10 @@
libvirt_package: qemu-kvm
libvirt_service_name: libvirtd
python_ceph_package: python-cephfs
python_ceph_package:
- python-cephfs
- python-rados
- python3-rados
# NOTE(hwoarang) Upstream does not provide openSUSE packages
# so we always set ceph_pkg_source to 'distro' for openSUSE

View File

@ -39,7 +39,8 @@ uca_repo_dist: "{{ ansible_lsb.codename }}-updates/{{ uca_openstack_release }}"
libvirt_package: libvirt-bin
libvirt_service_name: libvirt-bin
python_ceph_package: python-ceph
python_ceph_packages:
- python-ceph
# Apt repositories
ceph_apt_repos: