summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Polenchuk <mpolenchuk@mirantis.com>2018-07-18 14:49:22 +0400
committerMichael Polenchuk <mpolenchuk@mirantis.com>2018-07-18 14:52:12 +0400
commit4b730526068cc56e714827143fda236dae1ae37c (patch)
tree6995fc379e98dbb20e03ef49f74738f879beaa37
parentbd267864cf74da908379dedc378600501149477d (diff)
Set OpenDaylight REST port in openrc
JIRA: FUEL-380 Change-Id: I16039f6a0397f761e4cfa58be4cd45fd0beab925 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
-rw-r--r--mcp/reclass/classes/cluster/mcp-odl-ha/opendaylight/control.yml.j22
-rw-r--r--mcp/reclass/classes/cluster/mcp-odl-ha/openstack/control.yml2
-rw-r--r--mcp/reclass/classes/cluster/mcp-odl-ha/openstack/init.yml.j21
-rw-r--r--mcp/reclass/classes/cluster/mcp-odl-ha/openstack/proxy.yml4
-rw-r--r--mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control.yml2
-rw-r--r--mcp/reclass/classes/cluster/mcp-odl-noha/openstack/control.yml6
-rw-r--r--mcp/reclass/classes/cluster/mcp-odl-noha/openstack/init.yml1
7 files changed, 12 insertions, 6 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}
diff --git a/mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control.yml b/mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control.yml
index 0b513f065..536ebfad7 100644
--- a/mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control.yml
+++ b/mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control.yml
@@ -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: 3g
java_max_mem: 3g
router_enabled: true
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: