Merge "Adapt the list of ceph packages for SUSE"
This commit is contained in:
commit
a85eeba71d
|
@ -153,8 +153,7 @@ configurations need to be added to the user variable file:
|
||||||
|
|
||||||
ceph_extra_components:
|
ceph_extra_components:
|
||||||
- component: gnocchi_api
|
- component: gnocchi_api
|
||||||
package:
|
package: "{{ python_ceph_packages }}"
|
||||||
- "{{ python_ceph_package }}"
|
|
||||||
client:
|
client:
|
||||||
- '{{ gnocchi_ceph_client }}'
|
- '{{ gnocchi_ceph_client }}'
|
||||||
service: '{{ ceph_gnocchi_service_names }}'
|
service: '{{ ceph_gnocchi_service_names }}'
|
||||||
|
|
|
@ -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``.
|
|
@ -18,30 +18,22 @@
|
||||||
|
|
||||||
ceph_components:
|
ceph_components:
|
||||||
- component: glance_api
|
- component: glance_api
|
||||||
package:
|
package: "{{ python_ceph_packages }}"
|
||||||
- "{{ python_ceph_package }}"
|
|
||||||
client:
|
client:
|
||||||
- '{{ glance_ceph_client }}'
|
- '{{ glance_ceph_client }}'
|
||||||
service: '{{ ceph_glance_service_names }}'
|
service: '{{ ceph_glance_service_names }}'
|
||||||
- component: cinder_volume
|
- component: cinder_volume
|
||||||
package:
|
package: "{{ [ 'ceph-common' ] + python_ceph_packages }}"
|
||||||
- ceph-common
|
|
||||||
- "{{ python_ceph_package }}"
|
|
||||||
client:
|
client:
|
||||||
- '{{ cinder_ceph_client }}'
|
- '{{ cinder_ceph_client }}'
|
||||||
service: '{{ ceph_cinder_service_names }}'
|
service: '{{ ceph_cinder_service_names }}'
|
||||||
- component: cinder_backup
|
- component: cinder_backup
|
||||||
package:
|
package: "{{ [ 'ceph-common' ] + python_ceph_packages }}"
|
||||||
- ceph-common
|
|
||||||
- "{{ python_ceph_package }}"
|
|
||||||
client:
|
client:
|
||||||
- '{{ cinder_backup_ceph_client }}'
|
- '{{ cinder_backup_ceph_client }}'
|
||||||
service: '{{ ceph_cinder_service_names }}'
|
service: '{{ ceph_cinder_service_names }}'
|
||||||
- component: nova_compute
|
- component: nova_compute
|
||||||
package:
|
package: "{{ [ libvirt_package, 'ceph-common' ] + python_ceph_packages }}"
|
||||||
- "{{ libvirt_package }}"
|
|
||||||
- ceph-common
|
|
||||||
- "{{ python_ceph_package }}"
|
|
||||||
client:
|
client:
|
||||||
- '{{ nova_ceph_client }}'
|
- '{{ nova_ceph_client }}'
|
||||||
service: '{{ ceph_nova_service_names }}'
|
service: '{{ ceph_nova_service_names }}'
|
||||||
|
|
|
@ -19,7 +19,8 @@ ceph_gpg_keys: 'https://download.ceph.com/keys/release.asc'
|
||||||
libvirt_package: libvirt-daemon-kvm
|
libvirt_package: libvirt-daemon-kvm
|
||||||
libvirt_service_name: libvirtd
|
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_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"
|
ceph_yum_repo_url: "https://{{ ceph_repo_url_region }}.ceph.com/rpm-{{ ceph_stable_release }}/el7"
|
||||||
|
|
|
@ -16,7 +16,10 @@
|
||||||
libvirt_package: qemu-kvm
|
libvirt_package: qemu-kvm
|
||||||
libvirt_service_name: libvirtd
|
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
|
# NOTE(hwoarang) Upstream does not provide openSUSE packages
|
||||||
# so we always set ceph_pkg_source to 'distro' for openSUSE
|
# so we always set ceph_pkg_source to 'distro' for openSUSE
|
||||||
|
|
|
@ -39,7 +39,8 @@ uca_repo_dist: "{{ ansible_lsb.codename }}-updates/{{ uca_openstack_release }}"
|
||||||
libvirt_package: libvirt-bin
|
libvirt_package: libvirt-bin
|
||||||
libvirt_service_name: libvirt-bin
|
libvirt_service_name: libvirt-bin
|
||||||
|
|
||||||
python_ceph_package: python-ceph
|
python_ceph_packages:
|
||||||
|
- python-ceph
|
||||||
|
|
||||||
# Apt repositories
|
# Apt repositories
|
||||||
ceph_apt_repos:
|
ceph_apt_repos:
|
||||||
|
|
Loading…
Reference in New Issue