From 7dc9c890a90916cca1e19e6aa83825ae9503d71a Mon Sep 17 00:00:00 2001
From: Jean-Philippe Evrard <jean-philippe@evrard.me>
Date: Sat, 2 Dec 2017 14:19:32 +0000
Subject: [PATCH] Fix swift port conflict

To avoid any port conflict, whether on LB or on bare metal nodes,
we should make sure each service runs on its own port.

Here, we introduce a new variable, opendaylight_port, that maps
to upstream role port configuration ``nb_rest_port``.

Closes-Bug: 1735764
Depends-On: I55b310e6def8873ed5739f5f5176b867bc89443d
Needed-By: Ia91dc9c758a38f455e3b8ebb4aba65dbd13f409c
Change-Id: I49ff040ba96adb444f3f900190187b7607a0e256
---
 doc/source/app-opendaylight.rst          | 2 +-
 meta/main.yml                            | 1 +
 tests/neutron-overrides-opendaylight.yml | 2 +-
 tests/neutron-overrides-ovs-nsh.yml      | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/doc/source/app-opendaylight.rst b/doc/source/app-opendaylight.rst
index 86e0ba03..bd19bdc0 100644
--- a/doc/source/app-opendaylight.rst
+++ b/doc/source/app-opendaylight.rst
@@ -46,7 +46,7 @@ Set the following user variables in your
   odl_ip: "{{ hostvars[groups['opendaylight'][0]]['ansible_default_ipv4']['address'] }}"
   neutron_opendaylight_conf_ini_overrides:
     ml2_odl:
-      url: "http://{{ odl_ip }}:8080/controller/nb/v2/neutron"
+      url: "http://{{ odl_ip }}:8180/controller/nb/v2/neutron"
       username: <username>
       password: <password>
 
diff --git a/meta/main.yml b/meta/main.yml
index e5edca91..49bfdf50 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -59,6 +59,7 @@ dependencies:
   - role: opendaylight
     install_method: "{{ opendaylight_install_method }}"
     extra_features: "{{ opendaylight_extra_features }}"
+    nb_rest_port: "{{ opendaylight_port | default('8180') }}"
     when:
      - neutron_plugin_type == "ml2.opendaylight"
      - "'opendaylight' in group_names"
diff --git a/tests/neutron-overrides-opendaylight.yml b/tests/neutron-overrides-opendaylight.yml
index 88091268..1774d040 100644
--- a/tests/neutron-overrides-opendaylight.yml
+++ b/tests/neutron-overrides-opendaylight.yml
@@ -25,7 +25,7 @@ neutron_plugin_type: "ml2.opendaylight"
 odl_ip: "{{ hostvars[groups['opendaylight'][0]]['ansible_default_ipv4']['address'] }}"
 neutron_opendaylight_conf_ini_overrides:
   ml2_odl:
-    url: "http://{{ odl_ip }}:8080/controller/nb/v2/neutron"
+    url: "http://{{ odl_ip }}:8180/controller/nb/v2/neutron"
     username: admin
     password: admin
 
diff --git a/tests/neutron-overrides-ovs-nsh.yml b/tests/neutron-overrides-ovs-nsh.yml
index f7e6a22e..af19c35b 100644
--- a/tests/neutron-overrides-ovs-nsh.yml
+++ b/tests/neutron-overrides-ovs-nsh.yml
@@ -21,7 +21,7 @@ neutron_plugin_type: "ml2.opendaylight"
 odl_ip: "{{ hostvars[groups['opendaylight'][0]]['ansible_default_ipv4']['address'] }}"
 neutron_opendaylight_conf_ini_overrides:
   ml2_odl:
-    url: "http://{{ odl_ip }}:8080/controller/nb/v2/neutron"
+    url: "http://{{ odl_ip }}:8180/controller/nb/v2/neutron"
     username: admin
     password: admin