openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Add endpoint for ODL"

This commit is contained in:
Zuul 2018-01-24 22:24:49 +00:00 committed by Gerrit Code Review
parent 363a1018d8 278b141183
commit f8f5dfa095
12 changed files with 225 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
environments/ssl/tls-endpoints-public-dns.yaml
View File

@ -78,6 +78,8 @@ parameter_defaults:
OctaviaAdmin: {protocol: 'http', port: '9876', host: 'IP_ADDRESS'}
OctaviaInternal: {protocol: 'http', port: '9876', host: 'IP_ADDRESS'}
OctaviaPublic: {protocol: 'https', port: '13876', host: 'CLOUDNAME'}
OpenDaylightAdmin: {protocol: 'http', port: '8081', host: 'IP_ADDRESS'}
OpenDaylightInternal: {protocol: 'http', port: '8081', host: 'IP_ADDRESS'}
PankoAdmin: {protocol: 'http', port: '8977', host: 'IP_ADDRESS'}
PankoInternal: {protocol: 'http', port: '8977', host: 'IP_ADDRESS'}
PankoPublic: {protocol: 'https', port: '13977', host: 'CLOUDNAME'}

2
environments/ssl/tls-endpoints-public-ip.yaml
View File

@ -78,6 +78,8 @@ parameter_defaults:
OctaviaAdmin: {protocol: 'http', port: '9876', host: 'IP_ADDRESS'}
OctaviaInternal: {protocol: 'http', port: '9876', host: 'IP_ADDRESS'}
OctaviaPublic: {protocol: 'https', port: '13876', host: 'IP_ADDRESS'}
OpenDaylightAdmin: {protocol: 'http', port: '8081', host: 'IP_ADDRESS'}
OpenDaylightInternal: {protocol: 'http', port: '8081', host: 'IP_ADDRESS'}
PankoAdmin: {protocol: 'http', port: '8977', host: 'IP_ADDRESS'}
PankoInternal: {protocol: 'http', port: '8977', host: 'IP_ADDRESS'}
PankoPublic: {protocol: 'https', port: '13977', host: 'IP_ADDRESS'}

2
environments/ssl/tls-everywhere-endpoints-dns.yaml
View File

@ -78,6 +78,8 @@ parameter_defaults:
OctaviaAdmin: {protocol: 'https', port: '9876', host: 'IP_ADDRESS'}
OctaviaInternal: {protocol: 'https', port: '9876', host: 'IP_ADDRESS'}
OctaviaPublic: {protocol: 'https', port: '13876', host: 'CLOUDNAME'}
OpenDaylightAdmin: {protocol: 'https', port: '8081', host: 'CLOUDNAME'}
OpenDaylightInternal: {protocol: 'https', port: '8081', host: 'CLOUDNAME'}
PankoAdmin: {protocol: 'https', port: '8977', host: 'CLOUDNAME'}
PankoInternal: {protocol: 'https', port: '8977', host: 'CLOUDNAME'}
PankoPublic: {protocol: 'https', port: '13977', host: 'CLOUDNAME'}

2
environments/tls-endpoints-public-dns.yaml
View File

@ -72,6 +72,8 @@ parameter_defaults:
OctaviaAdmin: {protocol: 'http', port: '9876', host: 'IP_ADDRESS'}
OctaviaInternal: {protocol: 'http', port: '9876', host: 'IP_ADDRESS'}
OctaviaPublic: {protocol: 'https', port: '13876', host: 'CLOUDNAME'}
OpenDaylightAdmin: {protocol: 'http', port: '8081', host: 'IP_ADDRESS'}
OpenDaylightInternal: {protocol: 'http', port: '8081', host: 'IP_ADDRESS'}
PankoAdmin: {protocol: 'http', port: '8977', host: 'IP_ADDRESS'}
PankoInternal: {protocol: 'http', port: '8977', host: 'IP_ADDRESS'}
PankoPublic: {protocol: 'https', port: '13977', host: 'CLOUDNAME'}

2
environments/tls-endpoints-public-ip.yaml
View File

@ -72,6 +72,8 @@ parameter_defaults:
OctaviaAdmin: {protocol: 'http', port: '9876', host: 'IP_ADDRESS'}
OctaviaInternal: {protocol: 'http', port: '9876', host: 'IP_ADDRESS'}
OctaviaPublic: {protocol: 'https', port: '13876', host: 'IP_ADDRESS'}
OpenDaylightAdmin: {protocol: 'http', port: '8081', host: 'IP_ADDRESS'}
OpenDaylightInternal: {protocol: 'http', port: '8081', host: 'IP_ADDRESS'}
PankoAdmin: {protocol: 'http', port: '8977', host: 'IP_ADDRESS'}
PankoInternal: {protocol: 'http', port: '8977', host: 'IP_ADDRESS'}
PankoPublic: {protocol: 'https', port: '13977', host: 'IP_ADDRESS'}

2
environments/tls-everywhere-endpoints-dns.yaml
View File

@ -68,6 +68,8 @@ parameter_defaults:
OctaviaAdmin: {protocol: 'https', port: '9876', host: 'IP_ADDRESS'}
OctaviaInternal: {protocol: 'https', port: '9876', host: 'IP_ADDRESS'}
OctaviaPublic: {protocol: 'https', port: '13876', host: 'CLOUDNAME'}
OpenDaylightAdmin: {protocol: 'https', port: '8081', host: 'CLOUDNAME'}
OpenDaylightInternal: {protocol: 'https', port: '8081', host: 'CLOUDNAME'}
PankoAdmin: {protocol: 'https', port: '8977', host: 'CLOUDNAME'}
PankoInternal: {protocol: 'https', port: '8977', host: 'CLOUDNAME'}
PankoPublic: {protocol: 'https', port: '13977', host: 'CLOUDNAME'}

7
network/endpoints/endpoint_data.yaml
View File

@ -354,3 +354,10 @@ DockerRegistry:
Internal:
net_param: DockerRegistry
port: 8787
OpenDaylight:
Internal:
net_param: OpenDaylightApi
Admin:
net_param: OpenDaylightApi
port: 8081

164
network/endpoints/endpoint_map.yaml
View File

@ -85,6 +85,8 @@ parameters:
OctaviaAdmin: {protocol: http, port: '9876', host: IP_ADDRESS}
OctaviaInternal: {protocol: http, port: '9876', host: IP_ADDRESS}
OctaviaPublic: {protocol: http, port: '9876', host: IP_ADDRESS}
OpenDaylightAdmin: {protocol: http, port: '8081', host: IP_ADDRESS}
OpenDaylightInternal: {protocol: http, port: '8081', host: IP_ADDRESS}
PankoAdmin: {protocol: http, port: '8977', host: IP_ADDRESS}
PankoInternal: {protocol: http, port: '8977', host: IP_ADDRESS}
PankoPublic: {protocol: http, port: '8977', host: IP_ADDRESS}
@ -6528,6 +6530,168 @@ outputs:
template: NETWORK_uri
port:
get_param: [EndpointMap, OctaviaPublic, port]
OpenDaylightAdmin:
host:
str_replace:
template:
get_param: [EndpointMap, OpenDaylightAdmin, host]
params:
CLOUDNAME:
get_param:
- CloudEndpoints
- get_param: [ServiceNetMap, OpenDaylightApiNetwork]
IP_ADDRESS:
get_param:
- NetIpMap
- str_replace:
params:
NETWORK:
get_param: [ServiceNetMap, OpenDaylightApiNetwork]
template: NETWORK_uri
host_nobrackets:
str_replace:
template:
get_param: [EndpointMap, OpenDaylightAdmin, host]
params:
CLOUDNAME:
get_param:
- CloudEndpoints
- get_param: [ServiceNetMap, OpenDaylightApiNetwork]
IP_ADDRESS:
get_param:
- NetIpMap
- get_param: [ServiceNetMap, OpenDaylightApiNetwork]
port:
get_param: [EndpointMap, OpenDaylightAdmin, port]
protocol:
get_param: [EndpointMap, OpenDaylightAdmin, protocol]
uri:
make_url:
scheme:
get_param: [EndpointMap, OpenDaylightAdmin, protocol]
host:
str_replace:
template:
get_param: [EndpointMap, OpenDaylightAdmin, host]
params:
CLOUDNAME:
get_param:
- CloudEndpoints
- get_param: [ServiceNetMap, OpenDaylightApiNetwork]
IP_ADDRESS:
get_param:
- NetIpMap
- str_replace:
params:
NETWORK:
get_param: [ServiceNetMap, OpenDaylightApiNetwork]
template: NETWORK_uri
port:
get_param: [EndpointMap, OpenDaylightAdmin, port]
uri_no_suffix:
make_url:
scheme:
get_param: [EndpointMap, OpenDaylightAdmin, protocol]
host:
str_replace:
template:
get_param: [EndpointMap, OpenDaylightAdmin, host]
params:
CLOUDNAME:
get_param:
- CloudEndpoints
- get_param: [ServiceNetMap, OpenDaylightApiNetwork]
IP_ADDRESS:
get_param:
- NetIpMap
- str_replace:
params:
NETWORK:
get_param: [ServiceNetMap, OpenDaylightApiNetwork]
template: NETWORK_uri
port:
get_param: [EndpointMap, OpenDaylightAdmin, port]
OpenDaylightInternal:
host:
str_replace:
template:
get_param: [EndpointMap, OpenDaylightInternal, host]
params:
CLOUDNAME:
get_param:
- CloudEndpoints
- get_param: [ServiceNetMap, OpenDaylightApiNetwork]
IP_ADDRESS:
get_param:
- NetIpMap
- str_replace:
params:
NETWORK:
get_param: [ServiceNetMap, OpenDaylightApiNetwork]
template: NETWORK_uri
host_nobrackets:
str_replace:
template:
get_param: [EndpointMap, OpenDaylightInternal, host]
params:
CLOUDNAME:
get_param:
- CloudEndpoints
- get_param: [ServiceNetMap, OpenDaylightApiNetwork]
IP_ADDRESS:
get_param:
- NetIpMap
- get_param: [ServiceNetMap, OpenDaylightApiNetwork]
port:
get_param: [EndpointMap, OpenDaylightInternal, port]
protocol:
get_param: [EndpointMap, OpenDaylightInternal, protocol]
uri:
make_url:
scheme:
get_param: [EndpointMap, OpenDaylightInternal, protocol]
host:
str_replace:
template:
get_param: [EndpointMap, OpenDaylightInternal, host]
params:
CLOUDNAME:
get_param:
- CloudEndpoints
- get_param: [ServiceNetMap, OpenDaylightApiNetwork]
IP_ADDRESS:
get_param:
- NetIpMap
- str_replace:
params:
NETWORK:
get_param: [ServiceNetMap, OpenDaylightApiNetwork]
template: NETWORK_uri
port:
get_param: [EndpointMap, OpenDaylightInternal, port]
uri_no_suffix:
make_url:
scheme:
get_param: [EndpointMap, OpenDaylightInternal, protocol]
host:
str_replace:
template:
get_param: [EndpointMap, OpenDaylightInternal, host]
params:
CLOUDNAME:
get_param:
- CloudEndpoints
- get_param: [ServiceNetMap, OpenDaylightApiNetwork]
IP_ADDRESS:
get_param:
- NetIpMap
- str_replace:
params:
NETWORK:
get_param: [ServiceNetMap, OpenDaylightApiNetwork]
template: NETWORK_uri
port:
get_param: [EndpointMap, OpenDaylightInternal, port]
PankoAdmin:
host:
str_replace:

21
puppet/services/opendaylight-api.yaml
View File

@ -5,7 +5,7 @@ description: >
parameters:
OpenDaylightPort:
default: 8081
default: 0
description: Set opendaylight service port
type: number
OpenDaylightUsername:
@ -94,10 +94,16 @@ parameter_groups:
OpenStack mailing list.
parameters:
- OpenDaylightConnectionProtocol
- OpenDaylightPort
conditions:
internal_tls_enabled: {equals: [{get_param: EnableInternalTLS}, true]}
odl_deprecated_port_set:
not:
equals:
- {get_param: OpenDaylightPort}
- 0
outputs:
role_data:
@ -107,7 +113,11 @@ outputs:
config_settings:
map_merge:
-
opendaylight::odl_rest_port: {get_param: OpenDaylightPort}
opendaylight::odl_rest_port:
if:
- odl_deprecated_port_set
- {get_param: OpenDaylightPort}
- {get_param: [EndpointMap, OpenDaylightInternal, port]}
opendaylight::username: {get_param: OpenDaylightUsername}
opendaylight::password: {get_param: OpenDaylightPassword}
opendaylight::extra_features: {get_param: OpenDaylightFeatures}
@ -116,7 +126,10 @@ outputs:
tripleo.opendaylight_api.firewall_rules:
'137 opendaylight api':
dport:
- {get_param: OpenDaylightPort}
- if:
- odl_deprecated_port_set
- {get_param: OpenDaylightPort}
- {get_param: [EndpointMap, OpenDaylightInternal, port]}
- 6640
- 6653
- 2550
@ -174,4 +187,4 @@ outputs:
- service: odl
network: {get_param: [ServiceNetMap, OpendaylightApiNetwork]}
type: node
- null
- null

14
puppet/services/opendaylight-ovs.yaml
View File

@ -5,7 +5,7 @@ description: >
parameters:
OpenDaylightPort:
default: 8081
default: 0
description: Set opendaylight service port
type: number
OpenDaylightUsername:
@ -110,10 +110,16 @@ parameter_groups:
OpenStack mailing list.
parameters:
- OpenDaylightConnectionProtocol
- OpenDaylightPort
conditions:
internal_tls_enabled: {equals: [{get_param: EnableInternalTLS}, true]}
odl_deprecated_port_set:
not:
equals:
- {get_param: OpenDaylightPort}
- 0
resources:
Ovs:
@ -158,7 +164,11 @@ outputs:
service_name: opendaylight_ovs
config_settings:
map_merge:
- opendaylight::odl_rest_port: {get_param: OpenDaylightPort}
- opendaylight::odl_rest_port:
if:
- odl_deprecated_port_set
- {get_param: OpenDaylightPort}
- {get_param: [EndpointMap, OpenDaylightInternal, port]}
opendaylight::username: {get_param: OpenDaylightUsername}
opendaylight::password: {get_param: OpenDaylightPassword}
neutron::plugins::ovs::opendaylight::odl_username: {get_param: OpenDaylightUsername}

7
releasenotes/notes/odl_endpoint-74b00c6ed38e9a98.yaml Normal file
View File

@ -0,0 +1,7 @@
---
features:
- Endpoint is added for ODL. Public access is not allowed for ODL
so public endpoint is not added.
deprecations:
- Parameter "OpenDaylightPort" is deprecated and will be removed from
R.

6
sample-env-generator/ssl.yaml
View File

@ -173,6 +173,8 @@ environments:
OctaviaAdmin: {protocol: 'http', port: '9876', host: 'IP_ADDRESS'}
OctaviaInternal: {protocol: 'http', port: '9876', host: 'IP_ADDRESS'}
OctaviaPublic: {protocol: 'https', port: '13876', host: 'IP_ADDRESS'}
OpenDaylightAdmin: {protocol: 'http', port: '8081', host: 'IP_ADDRESS'}
OpenDaylightInternal: {protocol: 'http', port: '8081', host: 'IP_ADDRESS'}
PankoAdmin: {protocol: 'http', port: '8977', host: 'IP_ADDRESS'}
PankoInternal: {protocol: 'http', port: '8977', host: 'IP_ADDRESS'}
PankoPublic: {protocol: 'https', port: '13977', host: 'IP_ADDRESS'}
@ -275,6 +277,8 @@ environments:
OctaviaAdmin: {protocol: 'http', port: '9876', host: 'IP_ADDRESS'}
OctaviaInternal: {protocol: 'http', port: '9876', host: 'IP_ADDRESS'}
OctaviaPublic: {protocol: 'https', port: '13876', host: 'CLOUDNAME'}
OpenDaylightAdmin: {protocol: 'http', port: '8081', host: 'IP_ADDRESS'}
OpenDaylightInternal: {protocol: 'http', port: '8081', host: 'IP_ADDRESS'}
PankoAdmin: {protocol: 'http', port: '8977', host: 'IP_ADDRESS'}
PankoInternal: {protocol: 'http', port: '8977', host: 'IP_ADDRESS'}
PankoPublic: {protocol: 'https', port: '13977', host: 'CLOUDNAME'}
@ -377,6 +381,8 @@ environments:
OctaviaAdmin: {protocol: 'https', port: '9876', host: 'IP_ADDRESS'}
OctaviaInternal: {protocol: 'https', port: '9876', host: 'IP_ADDRESS'}
OctaviaPublic: {protocol: 'https', port: '13876', host: 'CLOUDNAME'}
OpenDaylightAdmin: {protocol: 'https', port: '8081', host: 'CLOUDNAME'}
OpenDaylightInternal: {protocol: 'https', port: '8081', host: 'CLOUDNAME'}
PankoAdmin: {protocol: 'https', port: '8977', host: 'CLOUDNAME'}
PankoInternal: {protocol: 'https', port: '8977', host: 'CLOUDNAME'}
PankoPublic: {protocol: 'https', port: '13977', host: 'CLOUDNAME'}