Merge "Add neutron_openvswitch_agent to env.d files"

This commit is contained in:
Jenkins 2016-05-10 05:52:57 +00:00 committed by Gerrit Code Review
commit 2a3c695972
4 changed files with 15 additions and 0 deletions

View File

@ -23,6 +23,9 @@ component_skel:
neutron_linuxbridge_agent: neutron_linuxbridge_agent:
belongs_to: belongs_to:
- neutron_all - neutron_all
neutron_openvswitch_agent:
belongs_to:
- neutron_all
neutron_metering_agent: neutron_metering_agent:
belongs_to: belongs_to:
- neutron_all - neutron_all
@ -49,6 +52,7 @@ container_skel:
- neutron_metadata_agent - neutron_metadata_agent
- neutron_metering_agent - neutron_metering_agent
- neutron_linuxbridge_agent - neutron_linuxbridge_agent
- neutron_openvswitch_agent
- neutron_l3_agent - neutron_l3_agent
- neutron_dhcp_agent - neutron_dhcp_agent
- neutron_lbaas_agent - neutron_lbaas_agent

View File

@ -67,6 +67,7 @@ container_skel:
- compute_containers - compute_containers
contains: contains:
- neutron_linuxbridge_agent - neutron_linuxbridge_agent
- neutron_openvswitch_agent
- nova_compute - nova_compute
properties: properties:
is_metal: true is_metal: true

View File

@ -0,0 +1,9 @@
---
upgrade:
- The new host group ``neutron_openvswitch_agent`` has been added to the ``env.d/neutron.yml``
and ``env.d/nova.yml`` environment configuration files in order to support the implementation
of Open vSwitch. Deployers must ensure that their environment configuration files are updated
to include the above group name. Please see the example implementations in
`env.d/neutron.yml <https://github.com/openstack/openstack-ansible/blob/stable/newton/etc/openstack_deploy/env.d/neutron.yml>`_
and
`env.d/nova.yml <https://github.com/openstack/openstack-ansible/blob/stable/newton/etc/openstack_deploy/env.d/nova.yml>`_.

View File

@ -147,6 +147,7 @@ class TestAnsibleInventoryFormatConstraints(unittest.TestCase):
'neutron_linuxbridge_agent', 'neutron_linuxbridge_agent',
'neutron_metadata_agent', 'neutron_metadata_agent',
'neutron_metering_agent', 'neutron_metering_agent',
'neutron_openvswitch_agent',
'neutron_server', 'neutron_server',
'neutron_server_container', 'neutron_server_container',
'nova_all', 'nova_all',