diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2017-09-20 10:52:33 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2017-09-22 01:23:16 +0200 |
| commit | d20653f306107baec1e0b9c7f879b1ac58e830d7 (patch) | |
| tree | 9aa5eafb3f0a429ad57b5999ce18d773c7549c9d /docker/restapi | |
| parent | 77b1231c610a659ca6e782c9297b4a0d918eb97f (diff) | |
Support https when testing ODL
It conforms with the last change on ODL tests [1].
Neutron endpoint is passed via robot args instead of Neutron ip.
Keystone url (based on OS_AUTH_URL) is passed too to replace Keystone
ip.
[1] https://git.opendaylight.org/gerrit/#/c/63293/
Conflicts:
docker/restapi/Dockerfile
docker/smoke/Dockerfile
Change-Id: Ie44f55304a438b1b0289ec69ac2241664be70e80
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit dd99f5356ef08f3a2a1ed18d63492391390df752)
Diffstat (limited to 'docker/restapi')
| -rw-r--r-- | docker/restapi/Dockerfile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docker/restapi/Dockerfile b/docker/restapi/Dockerfile index 50eb8a890..3021c839a 100644 --- a/docker/restapi/Dockerfile +++ b/docker/restapi/Dockerfile @@ -2,7 +2,7 @@ FROM opnfv/functest-core:euphrates ARG BRANCH=stable/euphrates ARG OPENSTACK_TAG=stable/ocata -ARG ODL_TAG=35e415b6873b39d72775c88a337e92dac26012e2 +ARG ODL_TAG=e12ba90cd27577c4c6c70ee54f7d599b5f6777ba ARG FDS_TAG=stable/euphrates ARG REFSTACK_TAG=4e187b07672dd1c41cb7c94658f1c91edebf53a2 ARG VIMS_TAG=stable |