diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-08-30 21:33:36 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-08-30 21:33:36 +0000 |
| commit | a813b056f2c959151563ec6558496e479e9dbb43 (patch) | |
| tree | ff7a089659d54854d8d4c48e29ad34a4db049285 | |
| parent | b6e8ed5b491a44e0a47cb3d9fca64fc59673bc68 (diff) | |
| parent | 0f2af352d15cb9c486414619a8342e727a2e207c (diff) | |
Merge "container ovs-agent, ensure br-ex exists" into stable/pike
| -rw-r--r-- | docker/services/neutron-ovs-agent.yaml | 31 | ||||
| -rw-r--r-- | environments/docker-network.yaml | 4 |
2 files changed, 33 insertions, 2 deletions
diff --git a/docker/services/neutron-ovs-agent.yaml b/docker/services/neutron-ovs-agent.yaml index 4cce23d9..81bb1c20 100644 --- a/docker/services/neutron-ovs-agent.yaml +++ b/docker/services/neutron-ovs-agent.yaml @@ -78,6 +78,37 @@ outputs: owner: neutron:neutron recurse: true docker_config: + step_3: + neutron_ovs_bridge: + detach: false + image: {get_param: DockerNeutronConfigImage} + net: host + pid: host + user: root + privileged: true + command: + - puppet + - apply + - --modulepath + - /etc/puppet/modules:/usr/share/openstack-puppet/modules + - --tags + - file,file_line,concat,augeas,neutron::plugins::ovs::bridge + - -v + - -e + - include neutron::agents::ml2::ovs + volumes: + list_concat: + - {get_attr: [ContainersCommon, volumes]} + - + - /var/lib/kolla/config_files/neutron_ovs_agent.json:/var/lib/kolla/config_files/config.json:ro + - /var/lib/config-data/puppet-generated/neutron/:/var/lib/kolla/config_files/src:ro + - /lib/modules:/lib/modules:ro + - /run:/run + - /etc/puppet:/etc/puppet:ro + - /usr/share/openstack-puppet/modules/:/usr/share/openstack-puppet/modules/:ro + - /var/run/openvswitch/db.sock:/var/run/openvswitch/db.sock + environment: + - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS step_4: neutron_ovs_agent: image: {get_param: DockerOpenvswitchImage} diff --git a/environments/docker-network.yaml b/environments/docker-network.yaml index f10ec389..bd73d4b3 100644 --- a/environments/docker-network.yaml +++ b/environments/docker-network.yaml @@ -1,2 +1,2 @@ -resource_registry: - OS::TripleO::Compute::Net::SoftwareConfig: ../net-config-bridge.yaml +# TODO(sbaker) Remove once CI and documentation no longer use this file +resource_registry: {} |