diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2020-03-03 11:02:28 +0100 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2020-03-03 13:18:07 +0100 |
| commit | 397ef4366cb3067c1a25999eab0e928937cc6e04 (patch) | |
| tree | 473c4d62004abceb57614337fcf7ff4a14953fa1 /docker | |
| parent | 7512cbfebd3cb40ce848760723111924c36b2268 (diff) | |
Add OVN Controller Gateway agent in neutron_bind_l2_agent_types
It avoids blacklisting NeutronNetworks.create_and_bind_ports in case of
OVN. It conforms with the upstream testing [1] and then reverts the
previous change [2].
[1] https://github.com/openstack/networking-ovn/blob/master/zuul.d/networking-ovn-jobs.yaml#L299
[2] https://git.opnfv.org/functest/commit/?id=8e297c49c481961959b29c2080cc059fcc84e9ee
This reverts commit 8e297c49c481961959b29c2080cc059fcc84e9ee.
Change-Id: I95f1b7146e636ae3ebe9f995733e53ad1b276d26
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/core/Dockerfile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile index 7d66e3b10..a4f174985 100644 --- a/docker/core/Dockerfile +++ b/docker/core/Dockerfile @@ -31,6 +31,7 @@ RUN apk --no-cache add --update \ ln -s /var/lib/xtesting /home/opnfv/functest && \ bash -c "mkdir -p /home/opnfv/functest{/conf,/data,/images,/results} /home/opnfv/repos/vnfs" && \ mkdir -p /etc/rally && \ - printf "[database]\nconnection = 'sqlite:////var/lib/rally/database/rally.sqlite'" > /etc/rally/rally.conf && \ + printf "[database]\nconnection = 'sqlite:////var/lib/rally/database/rally.sqlite'\n" > /etc/rally/rally.conf && \ + printf "\n[openstack]\nneutron_bind_l2_agent_types = Open vSwitch agent,Linux bridge agent,OVN Controller Gateway agent\n" >> /etc/rally/rally.conf && \ mkdir -p /var/lib/rally/database && rally db create && \ apk del .build-deps |