openstack
/
openstack-ansible-os_neutron
Code Issues Proposed changes

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 bae892d9ba.

Change-Id: I4f0128e629abe2b16dc64d9f3d56032f2f358129
This commit is contained in:
Jonathan Rosser 2019-02-16 19:58:33 +00:00
parent 7cfc21c1f4
commit e2340b7f04
4 changed files with 13 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
vars/distro_install.yml
View File

@ -44,18 +44,6 @@ neutron_package_list: |-
{% set _ = packages.extend(neutron_vpnaas_distro_packages) %}
{% set _ = packages.extend(neutron_optional_vpnaas_distro_packages) %}
{% endif %}
{% if neutron_services['neutron-server']['group'] in group_names %}
{% set _ = packages.extend(neutron_server_distro_packages) %}
{% endif %}
{% if neutron_services['neutron-dhcp-agent']['group'] in group_names %}
{% set _ = packages.extend(neutron_dhcp_agent_distro_packages) %}
{% endif %}
{% if neutron_services['neutron-l3-agent']['group'] in group_names %}
{% set _ = packages.extend(neutron_l3_agent_distro_packages) %}
{% endif %}
{% if neutron_services['neutron-metering-agent']['group'] in group_names %}
{% set _ = packages.extend(neutron_metering_agent_distro_packages) %}
{% endif %}
{% if neutron_services['neutron-metadata-agent']['group'] in group_names %}
{% set _ = packages.extend(neutron_metadata_agent_distro_packages) %}
{% endif %}

12
vars/redhat-7.yml
View File

@ -53,16 +53,10 @@ neutron_devel_distro_packages:
neutron_service_distro_packages:
- openstack-neutron
- openstack-neutron-ml2
- python-memcached
neutron_server_distro_packages: []
neutron_dhcp_agent_distro_packages: []
neutron_l3_agent_distro_packages: []
neutron_metering_agent_distro_packages:
- openstack-neutron-macvtap-agent
- openstack-neutron-metering-agent
- openstack-neutron-l2gw-agent
- python-memcached
neutron_optional_ovs_distro_packages:
- openstack-neutron-openvswitch

14
vars/suse.yml
View File

@ -68,20 +68,12 @@ neutron_devel_distro_packages:
neutron_service_distro_packages:
- openstack-neutron
- openstack-neutron-metadata-agent
- python-memcached
neutron_server_distro_packages:
- openstack-neutron-server
neutron_dhcp_agent_distro_packages:
- openstack-neutron-dhcp-agent
neutron_l3_agent_distro_packages:
- openstack-neutron-l3-agent
neutron_metering_agent_distro_packages:
- openstack-neutron-metadata-agent
- openstack-neutron-metering-agent
- openstack-neutron-server
- python-memcached
neutron_optional_ovs_distro_packages:
- openstack-neutron-openvswitch-agent

20
vars/ubuntu.yml
View File

@ -64,21 +64,16 @@ neutron_devel_distro_packages:
- python-httplib2
neutron_service_distro_packages:
- neutron-server
- neutron-dhcp-agent
- neutron-l2gateway-agent
- neutron-l3-agent
- neutron-macvtap-agent
- neutron-metadata-agent
- neutron-metering-agent
- neutron-plugin-ml2
- python-memcache
neutron_server_distro_packages:
- neutron-server
neutron_dhcp_agent_distro_packages:
- neutron-dhcp-agent
neutron_l3_agent_distro_packages:
- neutron-l3-agent
neutron_metering_agent_distro_packages:
- neutron-metering-agent
neutron_optional_ovs_distro_packages:
- neutron-openvswitch-agent
@ -107,7 +102,6 @@ neutron_vpnaas_distro_packages:
- strongswan
neutron_metadata_agent_distro_packages:
- neutron-metadata-agent
- haproxy
neutron_remove_distro_packages: