Merge "Adapt the list of ceph packages for SUSE"

doc/source/configure-ceph.rst

@@ -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 }}'

releasenotes/notes/renamed_variable_python_ceph_package-9575466eb146e500.yaml

@@ -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``.

vars/main.yml

@@ -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 }}'

vars/redhat-7.yml

@@ -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"

vars/suse-42.yml

@@ -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

vars/ubuntu-16.04.yml

@@ -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: