Revert "Avoid distro installing unused services"
The distro_install and service_install packages have got all
mixed up together. As a result source installs are dropping
openstack distro packages all over the place.
This reverts commit c0010010c2
.
Change-Id: I485ec63d7e3f750734fb07bf97aa4cdfcecae468
This commit is contained in:
parent
c0010010c2
commit
b982a4e826
|
@ -29,12 +29,6 @@ cinder_package_list: |-
|
|||
{% if cinder_services['cinder-backup']['group'] in group_names %}
|
||||
{% set _ = packages.extend(cinder_backup_distro_packages) %}
|
||||
{% endif %}
|
||||
{% if cinder_services['cinder-api']['group'] in group_names %}
|
||||
{% set _ = packages.extend(cinder_api_distro_packages) %}
|
||||
{% endif %}
|
||||
{% if cinder_services['cinder-scheduler']['group'] in group_names %}
|
||||
{% set _ = packages.extend(cinder_scheduler_distro_packages) %}
|
||||
{% endif %}
|
||||
{% if cinder_oslomsg_amqp1_enabled | bool %}
|
||||
{% set _ = packages.extend(cinder_oslomsg_amqp1_distro_packages) %}
|
||||
{% endif %}
|
||||
|
|
|
@ -47,10 +47,6 @@ cinder_volume_distro_packages_tools:
|
|||
- nfs-utils
|
||||
- rpcbind
|
||||
|
||||
cinder_api_distro_packages: []
|
||||
|
||||
cinder_scheduler_distro_packages: []
|
||||
|
||||
cinder_lvm_volume_distro_packages:
|
||||
- device-mapper-event
|
||||
- lvm2
|
||||
|
|
|
@ -26,6 +26,10 @@ cinder_distro_packages:
|
|||
|
||||
cinder_service_distro_packages:
|
||||
- openstack-cinder
|
||||
- openstack-cinder-api
|
||||
- openstack-cinder-backup
|
||||
- openstack-cinder-scheduler
|
||||
- openstack-cinder-volume
|
||||
- python-openstackclient
|
||||
- python-cursive
|
||||
- python-shade
|
||||
|
@ -41,8 +45,7 @@ cinder_devel_distro_packages:
|
|||
- systemd-devel
|
||||
- zlib-devel
|
||||
|
||||
cinder_volume_distro_packages:
|
||||
- openstack-cinder-volume
|
||||
cinder_volume_distro_packages: []
|
||||
|
||||
cinder_volume_distro_packages_tools:
|
||||
- qemu-tools
|
||||
|
@ -50,12 +53,6 @@ cinder_volume_distro_packages_tools:
|
|||
- nfs-utils
|
||||
- rpcbind
|
||||
|
||||
cinder_api_distro_packages:
|
||||
- openstack-cinder-api
|
||||
|
||||
cinder_scheduler_distro_packages:
|
||||
- openstack-cinder-scheduler
|
||||
|
||||
cinder_lvm_volume_distro_packages:
|
||||
- device-mapper
|
||||
- lvm2
|
||||
|
@ -63,7 +60,6 @@ cinder_lvm_volume_distro_packages:
|
|||
- tgt
|
||||
|
||||
cinder_backup_distro_packages:
|
||||
- openstack-cinder-backup
|
||||
- open-iscsi
|
||||
- nfs-utils
|
||||
- rpcbind
|
||||
|
|
|
@ -30,6 +30,10 @@ cinder_distro_packages:
|
|||
- zlibc
|
||||
|
||||
cinder_service_distro_packages:
|
||||
- cinder-api
|
||||
- cinder-backup
|
||||
- cinder-scheduler
|
||||
- cinder-volume
|
||||
- python-openstackclient
|
||||
- python-shade
|
||||
- python-systemd
|
||||
|
@ -46,8 +50,7 @@ cinder_devel_distro_packages:
|
|||
- libxslt1-dev
|
||||
- libsystemd-dev
|
||||
|
||||
cinder_volume_distro_packages:
|
||||
- cinder-volume
|
||||
cinder_volume_distro_packages: []
|
||||
|
||||
cinder_volume_distro_packages_tools:
|
||||
- qemu-utils
|
||||
|
@ -55,12 +58,6 @@ cinder_volume_distro_packages_tools:
|
|||
- nfs-common
|
||||
- rpcbind
|
||||
|
||||
cinder_api_distro_packages:
|
||||
- cinder-api
|
||||
|
||||
cinder_scheduler_distro_packages:
|
||||
- cinder-scheduler
|
||||
|
||||
cinder_lvm_volume_distro_packages:
|
||||
- dmeventd
|
||||
- lvm2
|
||||
|
@ -69,7 +66,6 @@ cinder_lvm_volume_distro_packages:
|
|||
- thin-provisioning-tools
|
||||
|
||||
cinder_backup_distro_packages:
|
||||
- cinder-backup
|
||||
- open-iscsi
|
||||
- nfs-common
|
||||
- rpcbind
|
||||
|
|
Loading…
Reference in New Issue