diff options
| author |   Steve Baker <sbaker@redhat.com> | 2017-08-15 10:26:24 +1200 |
|---|---|---|
| committer |   Emilien Macchi <emilien@redhat.com> | 2017-08-30 12:51:12 +0000 |
| commit | 0f2af352d15cb9c486414619a8342e727a2e207c (patch) | |
| tree | bd3a323a9435c9df06d78b258fc2438333b7185d /environments | |
| parent | d772eb77273402a54503906ff40d2d8aa0dc5630 (diff) | |
container ovs-agent, ensure br-ex exists
Currently the container neutron-ovs-agent is stuck in a restart loop
in many environments because the bridge br-ex is missing.
This bridge is created by running the puppet class
neutron::agents::ml2::ovs but limiting that run to tag
neutron::plugins::ovs::bridge.
The hiera neutron::agents::ml2::ovs::bridge_mappings should already
exists to create the bridge with the required settings.
This change should ensure br-ex exists after step 3.
Since br-ex is created regardless of the chosen network config,
environments/docker-network.yaml is not longer required. It can be
deleted once there are no more references to it in CI and
documentation.
Change-Id: Ie425148b0ad0f38e149c5fa0a97d98ec35d0a5bb
Closes-Bug: #1699261
Closes-Bug: #1691403
Closes-Bug: #1689556
(cherry picked from commit 76f130d6e8f7434433b2602af9794f1e9c742e1f)
Diffstat (limited to 'environments')
| -rw-r--r-- | environments/docker-network.yaml | 4 |
1 files changed, 2 insertions, 2 deletions
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: {} |