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
This commit is contained in:
Jean-Philippe Evrard 2017-12-02 14:19:32 +00:00
parent faff5b0bdc
commit 7dc9c890a9
4 changed files with 4 additions and 3 deletions

View File

@ -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>

View File

@ -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"

View File

@ -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

View File

@ -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