diff options
| author |   Michael Polenchuk <mpolenchuk@mirantis.com> | 2018-07-19 15:37:19 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-07-19 15:37:19 +0000 |
| commit | d76ded2f4226bb035e773df013e4fbbcce1067cb (patch) | |
| tree | ae561cc50521ad59650cc2ffb497abe5bfc1f6c3 /mcp/reclass/classes/cluster/mcp-odl-noha/openstack | |
| parent | 80f61ab367b0b5fa6521f7988f9340e83070a98b (diff) | |
| parent | 4b730526068cc56e714827143fda236dae1ae37c (diff) | |
Merge "Set OpenDaylight REST port in openrc"
Diffstat (limited to 'mcp/reclass/classes/cluster/mcp-odl-noha/openstack')
| -rw-r--r-- | mcp/reclass/classes/cluster/mcp-odl-noha/openstack/control.yml | 6 | ||||
| -rw-r--r-- | mcp/reclass/classes/cluster/mcp-odl-noha/openstack/init.yml | 1 |
2 files changed, 5 insertions, 2 deletions
diff --git a/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/control.yml b/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/control.yml index f5ed2dc5d..c9c683fc7 100644 --- a/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/control.yml +++ b/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/control.yml @@ -19,11 +19,11 @@ parameters: service_name: opendaylight binds: - address: ${_param:cluster_vip_address} - port: 8282 + port: ${_param:opendaylight_rest_port} servers: - name: odl01 host: ${_param:opendaylight_service_host} - port: 8282 + port: ${_param:opendaylight_rest_port} params: ${_param:haproxy_check} keystone: server: @@ -32,3 +32,5 @@ parameters: sdn_controller_ip: ${_param:cluster_vip_address} sdn_username: admin # Hardcoded to default ODL values for now sdn_password: admin + sdn_controller_webport: ${_param:opendaylight_rest_port} + sdn_controller_restconfport: ${_param:opendaylight_rest_port} diff --git a/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/init.yml b/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/init.yml index 91e002667..a3918b231 100644 --- a/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/init.yml +++ b/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/init.yml @@ -12,6 +12,7 @@ parameters: _param: neutron_tenant_network_types: "flat,vxlan" opendaylight_router: odl-router_v2 + opendaylight_rest_port: 8282 linux: network: host: |