openstack/openstack-ansible-os_neutron
Code Issues Proposed changes

Updated multi-distro setup for isolation

Browse Source 
The changes here update the multi-distro framework within os_neutron
to isolate package variables and init systems which will pave the way
for additional OS support.

Change-Id: Id6c15220bbd4120d525147d02aaf15c0f47e49e6
Signed-off-by: Kevin Carter <kevin.carter@rackspace.com>
This commit is contained in:
Kevin Carter 2016-06-02 20:28:17 -05:00 committed by Kevin Carter (cloudnull)
parent dbbdebba56
commit 3794674288
5 changed files with 50 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
defaults/main.yml
View File

@ -405,29 +405,6 @@ neutron_service_in_ldap: false
# neutron_local_ip is used for the VXLAN local tunnel endpoint
neutron_local_ip: 127.0.0.1
neutron_apt_packages:
- conntrack
- dnsmasq-base
- dnsmasq-utils
- ebtables
- ipset
- iputils-arping
- keepalived
- libpq-dev
- radvd
neutron_lxb_apt_packages:
- bridge-utils
neutron_lbaas_apt_packages:
- haproxy
neutron_vpnaas_apt_packages:
- openswan
neutron_apt_remove_packages:
- conntrackd
# neutron packages that must be installed before anything else
neutron_requires_pip_packages:
- virtualenv

12
tasks/main.yml
View File

@ -24,6 +24,18 @@
tags:
- always
- name: Check init system
command: cat /proc/1/comm
register: _pid1_name
tags:
- always
- name: Set the name of pid1
set_fact:
pid1_name: "{{ _pid1_name.stdout }}"
tags:
- always
- include: ovs_install.yml
when:
- neutron_services['neutron-openvswitch-agent']['group'] in group_names

8
tasks/neutron_init_common.yml
View File

@ -14,16 +14,12 @@
# limitations under the License.
- include: neutron_init_upstart.yml
when:
- ansible_distribution | lower == 'ubuntu'
- ansible_distribution_version | version_compare('16.04', '<')
when: pid1_name == "init"
tags:
- neutron-init
- include: neutron_init_systemd.yml
when:
- ansible_distribution | lower == 'ubuntu'
- ansible_distribution_version | version_compare('16.04', '>=')
when: pid1_name == "systemd"
tags:
- neutron-init

19
vars/ubuntu-14.04.yml
View File

@ -33,13 +33,30 @@ neutron_apt_dependencies:
- libpq-dev
- radvd
neutron_apt_packages:
- conntrack
- dnsmasq-base
- dnsmasq-utils
- ebtables
- ipset
- iputils-arping
- keepalived
- libpq-dev
- radvd
neutron_lxb_apt_packages:
- bridge-utils
neutron_lbaas_apt_packages:
- haproxy
neutron_vpnaas_apt_packages:
- openswan
neutron_apt_remove_packages:
- conntrackd
neutron_lbaasv1_initscript_path: "/etc/init/neutron-lbaas-agent.conf"
neutron_lbaasv2_initscript_path: "/etc/init/neutron-lbaasv2-agent.conf"
neutron_lbaasv1_agent_servicename: "neutron-lbaas-agent"
neutron_lbaasv2_agent_servicename: "neutron-lbaasv2-agent"
neutron_lbaasv2_agent_servicename: "neutron-lbaasv2-agent"

19
vars/ubuntu-16.04.yml
View File

@ -35,13 +35,30 @@ neutron_apt_dependencies:
- libpq-dev
- radvd
neutron_apt_packages:
- conntrack
- dnsmasq-base
- dnsmasq-utils
- ebtables
- ipset
- iputils-arping
- keepalived
- libpq-dev
- radvd
neutron_lxb_apt_packages:
- bridge-utils
neutron_lbaas_apt_packages:
- haproxy
neutron_vpnaas_apt_packages:
- openswan
neutron_apt_remove_packages:
- conntrackd
neutron_lbaasv1_initscript_path: "/etc/init/neutron-lbaas-agent.conf"
neutron_lbaasv2_initscript_path: "/etc/init/neutron-lbaasv2-agent.conf"
neutron_lbaasv1_agent_servicename: "neutron-lbaas-agent"
neutron_lbaasv2_agent_servicename: "neutron-lbaasv2-agent"
neutron_lbaasv2_agent_servicename: "neutron-lbaasv2-agent"