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-ha | |
| parent | 80f61ab367b0b5fa6521f7988f9340e83070a98b (diff) | |
| parent | 4b730526068cc56e714827143fda236dae1ae37c (diff) | |
Merge "Set OpenDaylight REST port in openrc"
Diffstat (limited to 'mcp/reclass/classes/cluster/mcp-odl-ha')
4 files changed, 6 insertions, 3 deletions
diff --git a/mcp/reclass/classes/cluster/mcp-odl-ha/opendaylight/control.yml.j2 b/mcp/reclass/classes/cluster/mcp-odl-ha/opendaylight/control.yml.j2 index a6027e08a..685cd9ec1 100644 --- a/mcp/reclass/classes/cluster/mcp-odl-ha/opendaylight/control.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-odl-ha/opendaylight/control.yml.j2 @@ -18,7 +18,7 @@ parameters: opendaylight: server: odl_bind_ip: ${_param:single_address} - odl_rest_port: 8282 + odl_rest_port: ${_param:opendaylight_rest_port} java_min_mem: 6g java_max_mem: 6g router_enabled: true diff --git a/mcp/reclass/classes/cluster/mcp-odl-ha/openstack/control.yml b/mcp/reclass/classes/cluster/mcp-odl-ha/openstack/control.yml index 547b61e0f..7b03f29e4 100644 --- a/mcp/reclass/classes/cluster/mcp-odl-ha/openstack/control.yml +++ b/mcp/reclass/classes/cluster/mcp-odl-ha/openstack/control.yml @@ -19,3 +19,5 @@ parameters: sdn_controller_ip: ${_param:cluster_public_host} 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-ha/openstack/init.yml.j2 b/mcp/reclass/classes/cluster/mcp-odl-ha/openstack/init.yml.j2 index 43779e927..6301e737a 100644 --- a/mcp/reclass/classes/cluster/mcp-odl-ha/openstack/init.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-odl-ha/openstack/init.yml.j2 @@ -12,6 +12,7 @@ parameters: _param: # opendaylight options opendaylight_service_host: ${_param:opendaylight_server_node01_single_address} + opendaylight_rest_port: 8282 neutron_tenant_network_types: "flat,vxlan" {%- if conf.MCP_VCP %} diff --git a/mcp/reclass/classes/cluster/mcp-odl-ha/openstack/proxy.yml b/mcp/reclass/classes/cluster/mcp-odl-ha/openstack/proxy.yml index f0d4ecc37..ef67f3b15 100644 --- a/mcp/reclass/classes/cluster/mcp-odl-ha/openstack/proxy.yml +++ b/mcp/reclass/classes/cluster/mcp-odl-ha/openstack/proxy.yml @@ -21,8 +21,8 @@ parameters: check: false proxy: host: ${_param:opendaylight_service_host} - port: 8282 + port: ${_param:opendaylight_rest_port} protocol: http host: name: ${_param:nginx_proxy_openstack_api_host} - port: 8282 + port: ${_param:opendaylight_rest_port} |