diff options
Diffstat (limited to 'mcp/reclass/classes/cluster/mcp-odl-noha')
3 files changed, 8 insertions, 5 deletions
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..03bd1efd4 100644 --- a/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/control.yml +++ b/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/control.yml @@ -19,16 +19,18 @@ 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: openrc_extra: # For noHA, all public services are available through haproxy on ctl sdn_controller_ip: ${_param:cluster_vip_address} - sdn_username: admin # Hardcoded to default ODL values for now - sdn_password: admin + sdn_controller_user: admin # Hardcoded to default ODL values for now + sdn_controller_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: |