Merge "Fix swift port conflict"

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>
 

meta/main.yml

@@ -58,6 +58,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"

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
 

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