Merge "Install virsh for Centos"

This commit is contained in:
Zuul 2020-01-28 12:27:27 +00:00 committed by Gerrit Code Review
commit 54ae531bcf
5 changed files with 16 additions and 4 deletions

View File

@ -0,0 +1,5 @@
---
upgrade:
- |
Variable `libvirt_package` in ceph_client role has been renamed to
`libvirt_packages` and converted from string to a list.

View File

@ -35,7 +35,9 @@ 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 }}/"
# LibVirt differentials between Debian and Ubuntu
libvirt_package: "{{ (ansible_distribution == 'Debian') | ternary('libvirt-daemon-system', 'libvirt-bin') }}"
libvirt_packages:
- "{{ (ansible_distribution == 'Debian') | ternary('libvirt-daemon-system', 'libvirt-bin') }}"
libvirt_service_name: libvirtd
python_ceph_packages:

View File

@ -33,7 +33,7 @@ ceph_components:
- '{{ cinder_backup_ceph_client }}'
service: '{{ ceph_cinder_service_names }}'
- component: nova_compute
package: "{{ [ libvirt_package, 'ceph-common' ] + python_ceph_packages }}"
package: "{{ libvirt_packages + [ 'ceph-common' ] + python_ceph_packages }}"
client:
- '{{ nova_ceph_client }}'
service: '{{ ceph_nova_service_names }}'

View File

@ -23,7 +23,10 @@ epel_gpg_keys:
# Extra Packages for Enterprise Linux 7
- key: /etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7
libvirt_package: libvirt-daemon-kvm
libvirt_packages:
- libvirt-daemon-kvm
- libvirt-client
libvirt_service_name: libvirtd
python_ceph_packages:

View File

@ -13,7 +13,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.
libvirt_package: qemu-kvm
libvirt_packages:
- qemu-kvm
libvirt_service_name: libvirtd
python_ceph_packages: