Merge "Add Octavia API service definitions"
This commit is contained in:
Jenkins
Gerrit Code Review
commit
7dbd771a35
@ -58,6 +58,9 @@ parameter_defaults:
|
||||
NovaVNCProxyAdmin: {protocol: 'http', port: '6080', host: 'IP_ADDRESS'}
|
||||
NovaVNCProxyInternal: {protocol: 'http', port: '6080', host: 'IP_ADDRESS'}
|
||||
NovaVNCProxyPublic: {protocol: 'https', port: '13080', host: 'CLOUDNAME'}
|
||||
OctaviaAdmin: {protocol: 'http', port: '9876', host: 'IP_ADDRESS'}
|
||||
OctaviaInternal: {protocol: 'http', port: '9876', host: 'IP_ADDRESS'}
|
||||
OctaviaPublic: {protocol: 'https', port: '13876', host: 'CLOUDNAME'}
|
||||
PankoAdmin: {protocol: 'http', port: '8779', host: 'IP_ADDRESS'}
|
||||
PankoInternal: {protocol: 'http', port: '8779', host: 'IP_ADDRESS'}
|
||||
PankoPublic: {protocol: 'https', port: '13779', host: 'CLOUDNAME'}
|
||||
|
||||
@ -58,6 +58,9 @@ parameter_defaults:
|
||||
NovaVNCProxyAdmin: {protocol: 'http', port: '6080', host: 'IP_ADDRESS'}
|
||||
NovaVNCProxyInternal: {protocol: 'http', port: '6080', host: 'IP_ADDRESS'}
|
||||
NovaVNCProxyPublic: {protocol: 'https', port: '13080', host: 'IP_ADDRESS'}
|
||||
OctaviaAdmin: {protocol: 'http', port: '9876', host: 'IP_ADDRESS'}
|
||||
OctaviaInternal: {protocol: 'http', port: '9876', host: 'IP_ADDRESS'}
|
||||
OctaviaPublic: {protocol: 'https', port: '13876', host: 'IP_ADDRESS'}
|
||||
PankoAdmin: {protocol: 'http', port: '8779', host: 'IP_ADDRESS'}
|
||||
PankoInternal: {protocol: 'http', port: '8779', host: 'IP_ADDRESS'}
|
||||
PankoPublic: {protocol: 'https', port: '13779', host: 'IP_ADDRESS'}
|
||||
|
||||
@ -58,6 +58,9 @@ parameter_defaults:
|
||||
NovaVNCProxyAdmin: {protocol: 'https', port: '6080', host: 'CLOUDNAME'}
|
||||
NovaVNCProxyInternal: {protocol: 'https', port: '6080', host: 'CLOUDNAME'}
|
||||
NovaVNCProxyPublic: {protocol: 'https', port: '13080', host: 'CLOUDNAME'}
|
||||
OctaviaAdmin: {protocol: 'https', port: '9876', host: 'IP_ADDRESS'}
|
||||
OctaviaInternal: {protocol: 'https', port: '9876', host: 'IP_ADDRESS'}
|
||||
OctaviaPublic: {protocol: 'https', port: '13876', host: 'CLOUDNAME'}
|
||||
PankoAdmin: {protocol: 'https', port: '8779', host: 'CLOUDNAME'}
|
||||
PankoInternal: {protocol: 'https', port: '8779', host: 'CLOUDNAME'}
|
||||
PankoPublic: {protocol: 'https', port: '13779', host: 'CLOUDNAME'}
|
||||
|
||||
@ -314,3 +314,12 @@ ZaqarWebSocket:
|
||||
net_param: ZaqarApi
|
||||
port: 9000
|
||||
protocol: ws
|
||||
|
||||
Octavia:
|
||||
Internal:
|
||||
net_param: OctaviaApi
|
||||
Public:
|
||||
net_param: Public
|
||||
Admin:
|
||||
net_param: OctaviaApi
|
||||
port: 9876
|
||||
|
||||
@ -75,6 +75,9 @@ parameters:
|
||||
NovaVNCProxyAdmin: {protocol: http, port: '6080', host: IP_ADDRESS}
|
||||
NovaVNCProxyInternal: {protocol: http, port: '6080', host: IP_ADDRESS}
|
||||
NovaVNCProxyPublic: {protocol: http, port: '6080', host: IP_ADDRESS}
|
||||
OctaviaAdmin: {protocol: http, port: '9876', host: IP_ADDRESS}
|
||||
OctaviaInternal: {protocol: http, port: '9876', host: IP_ADDRESS}
|
||||
OctaviaPublic: {protocol: http, port: '9876', host: IP_ADDRESS}
|
||||
PankoAdmin: {protocol: http, port: '8779', host: IP_ADDRESS}
|
||||
PankoInternal: {protocol: http, port: '8779', host: IP_ADDRESS}
|
||||
PankoPublic: {protocol: http, port: '8779', host: IP_ADDRESS}
|
||||
@ -5733,6 +5736,249 @@ outputs:
|
||||
template: NETWORK_uri
|
||||
- ':'
|
||||
- get_param: [EndpointMap, NovaVNCProxyPublic, port]
|
||||
OctaviaAdmin:
|
||||
host:
|
||||
str_replace:
|
||||
template:
|
||||
get_param: [EndpointMap, OctaviaAdmin, host]
|
||||
params:
|
||||
CLOUDNAME:
|
||||
get_param:
|
||||
- CloudEndpoints
|
||||
- get_param: [ServiceNetMap, OctaviaApiNetwork]
|
||||
IP_ADDRESS:
|
||||
get_param:
|
||||
- NetIpMap
|
||||
- str_replace:
|
||||
params:
|
||||
NETWORK:
|
||||
get_param: [ServiceNetMap, OctaviaApiNetwork]
|
||||
template: NETWORK_uri
|
||||
host_nobrackets:
|
||||
str_replace:
|
||||
template:
|
||||
get_param: [EndpointMap, OctaviaAdmin, host]
|
||||
params:
|
||||
CLOUDNAME:
|
||||
get_param:
|
||||
- CloudEndpoints
|
||||
- get_param: [ServiceNetMap, OctaviaApiNetwork]
|
||||
IP_ADDRESS:
|
||||
get_param:
|
||||
- NetIpMap
|
||||
- get_param: [ServiceNetMap, OctaviaApiNetwork]
|
||||
port:
|
||||
get_param: [EndpointMap, OctaviaAdmin, port]
|
||||
protocol:
|
||||
get_param: [EndpointMap, OctaviaAdmin, protocol]
|
||||
uri:
|
||||
list_join:
|
||||
- ''
|
||||
- - get_param: [EndpointMap, OctaviaAdmin, protocol]
|
||||
- ://
|
||||
- str_replace:
|
||||
template:
|
||||
get_param: [EndpointMap, OctaviaAdmin, host]
|
||||
params:
|
||||
CLOUDNAME:
|
||||
get_param:
|
||||
- CloudEndpoints
|
||||
- get_param: [ServiceNetMap, OctaviaApiNetwork]
|
||||
IP_ADDRESS:
|
||||
get_param:
|
||||
- NetIpMap
|
||||
- str_replace:
|
||||
params:
|
||||
NETWORK:
|
||||
get_param: [ServiceNetMap, OctaviaApiNetwork]
|
||||
template: NETWORK_uri
|
||||
- ':'
|
||||
- get_param: [EndpointMap, OctaviaAdmin, port]
|
||||
uri_no_suffix:
|
||||
list_join:
|
||||
- ''
|
||||
- - get_param: [EndpointMap, OctaviaAdmin, protocol]
|
||||
- ://
|
||||
- str_replace:
|
||||
template:
|
||||
get_param: [EndpointMap, OctaviaAdmin, host]
|
||||
params:
|
||||
CLOUDNAME:
|
||||
get_param:
|
||||
- CloudEndpoints
|
||||
- get_param: [ServiceNetMap, OctaviaApiNetwork]
|
||||
IP_ADDRESS:
|
||||
get_param:
|
||||
- NetIpMap
|
||||
- str_replace:
|
||||
params:
|
||||
NETWORK:
|
||||
get_param: [ServiceNetMap, OctaviaApiNetwork]
|
||||
template: NETWORK_uri
|
||||
- ':'
|
||||
- get_param: [EndpointMap, OctaviaAdmin, port]
|
||||
OctaviaInternal:
|
||||
host:
|
||||
str_replace:
|
||||
template:
|
||||
get_param: [EndpointMap, OctaviaInternal, host]
|
||||
params:
|
||||
CLOUDNAME:
|
||||
get_param:
|
||||
- CloudEndpoints
|
||||
- get_param: [ServiceNetMap, OctaviaApiNetwork]
|
||||
IP_ADDRESS:
|
||||
get_param:
|
||||
- NetIpMap
|
||||
- str_replace:
|
||||
params:
|
||||
NETWORK:
|
||||
get_param: [ServiceNetMap, OctaviaApiNetwork]
|
||||
template: NETWORK_uri
|
||||
host_nobrackets:
|
||||
str_replace:
|
||||
template:
|
||||
get_param: [EndpointMap, OctaviaInternal, host]
|
||||
params:
|
||||
CLOUDNAME:
|
||||
get_param:
|
||||
- CloudEndpoints
|
||||
- get_param: [ServiceNetMap, OctaviaApiNetwork]
|
||||
IP_ADDRESS:
|
||||
get_param:
|
||||
- NetIpMap
|
||||
- get_param: [ServiceNetMap, OctaviaApiNetwork]
|
||||
port:
|
||||
get_param: [EndpointMap, OctaviaInternal, port]
|
||||
protocol:
|
||||
get_param: [EndpointMap, OctaviaInternal, protocol]
|
||||
uri:
|
||||
list_join:
|
||||
- ''
|
||||
- - get_param: [EndpointMap, OctaviaInternal, protocol]
|
||||
- ://
|
||||
- str_replace:
|
||||
template:
|
||||
get_param: [EndpointMap, OctaviaInternal, host]
|
||||
params:
|
||||
CLOUDNAME:
|
||||
get_param:
|
||||
- CloudEndpoints
|
||||
- get_param: [ServiceNetMap, OctaviaApiNetwork]
|
||||
IP_ADDRESS:
|
||||
get_param:
|
||||
- NetIpMap
|
||||
- str_replace:
|
||||
params:
|
||||
NETWORK:
|
||||
get_param: [ServiceNetMap, OctaviaApiNetwork]
|
||||
template: NETWORK_uri
|
||||
- ':'
|
||||
- get_param: [EndpointMap, OctaviaInternal, port]
|
||||
uri_no_suffix:
|
||||
list_join:
|
||||
- ''
|
||||
- - get_param: [EndpointMap, OctaviaInternal, protocol]
|
||||
- ://
|
||||
- str_replace:
|
||||
template:
|
||||
get_param: [EndpointMap, OctaviaInternal, host]
|
||||
params:
|
||||
CLOUDNAME:
|
||||
get_param:
|
||||
- CloudEndpoints
|
||||
- get_param: [ServiceNetMap, OctaviaApiNetwork]
|
||||
IP_ADDRESS:
|
||||
get_param:
|
||||
- NetIpMap
|
||||
- str_replace:
|
||||
params:
|
||||
NETWORK:
|
||||
get_param: [ServiceNetMap, OctaviaApiNetwork]
|
||||
template: NETWORK_uri
|
||||
- ':'
|
||||
- get_param: [EndpointMap, OctaviaInternal, port]
|
||||
OctaviaPublic:
|
||||
host:
|
||||
str_replace:
|
||||
template:
|
||||
get_param: [EndpointMap, OctaviaPublic, host]
|
||||
params:
|
||||
CLOUDNAME:
|
||||
get_param:
|
||||
- CloudEndpoints
|
||||
- get_param: [ServiceNetMap, PublicNetwork]
|
||||
IP_ADDRESS:
|
||||
get_param:
|
||||
- NetIpMap
|
||||
- str_replace:
|
||||
params:
|
||||
NETWORK:
|
||||
get_param: [ServiceNetMap, PublicNetwork]
|
||||
template: NETWORK_uri
|
||||
host_nobrackets:
|
||||
str_replace:
|
||||
template:
|
||||
get_param: [EndpointMap, OctaviaPublic, host]
|
||||
params:
|
||||
CLOUDNAME:
|
||||
get_param:
|
||||
- CloudEndpoints
|
||||
- get_param: [ServiceNetMap, PublicNetwork]
|
||||
IP_ADDRESS:
|
||||
get_param:
|
||||
- NetIpMap
|
||||
- get_param: [ServiceNetMap, PublicNetwork]
|
||||
port:
|
||||
get_param: [EndpointMap, OctaviaPublic, port]
|
||||
protocol:
|
||||
get_param: [EndpointMap, OctaviaPublic, protocol]
|
||||
uri:
|
||||
list_join:
|
||||
- ''
|
||||
- - get_param: [EndpointMap, OctaviaPublic, protocol]
|
||||
- ://
|
||||
- str_replace:
|
||||
template:
|
||||
get_param: [EndpointMap, OctaviaPublic, host]
|
||||
params:
|
||||
CLOUDNAME:
|
||||
get_param:
|
||||
- CloudEndpoints
|
||||
- get_param: [ServiceNetMap, PublicNetwork]
|
||||
IP_ADDRESS:
|
||||
get_param:
|
||||
- NetIpMap
|
||||
- str_replace:
|
||||
params:
|
||||
NETWORK:
|
||||
get_param: [ServiceNetMap, PublicNetwork]
|
||||
template: NETWORK_uri
|
||||
- ':'
|
||||
- get_param: [EndpointMap, OctaviaPublic, port]
|
||||
uri_no_suffix:
|
||||
list_join:
|
||||
- ''
|
||||
- - get_param: [EndpointMap, OctaviaPublic, protocol]
|
||||
- ://
|
||||
- str_replace:
|
||||
template:
|
||||
get_param: [EndpointMap, OctaviaPublic, host]
|
||||
params:
|
||||
CLOUDNAME:
|
||||
get_param:
|
||||
- CloudEndpoints
|
||||
- get_param: [ServiceNetMap, PublicNetwork]
|
||||
IP_ADDRESS:
|
||||
get_param:
|
||||
- NetIpMap
|
||||
- str_replace:
|
||||
params:
|
||||
NETWORK:
|
||||
get_param: [ServiceNetMap, PublicNetwork]
|
||||
template: NETWORK_uri
|
||||
- ':'
|
||||
- get_param: [EndpointMap, OctaviaPublic, port]
|
||||
PankoAdmin:
|
||||
host:
|
||||
str_replace:
|
||||
|
||||
@ -41,6 +41,7 @@ parameters:
|
||||
KeystonePublicApiNetwork: internal_api
|
||||
ManilaApiNetwork: internal_api
|
||||
NeutronApiNetwork: internal_api
|
||||
OctaviaApiNetwork: internal_api
|
||||
HeatApiNetwork: internal_api
|
||||
HeatApiCfnNetwork: internal_api
|
||||
HeatApiCloudwatchNetwork: internal_api
|
||||
|
||||
97
puppet/services/octavia-api.yaml
Normal file
97
puppet/services/octavia-api.yaml
Normal file
@ -0,0 +1,97 @@
|
||||
heat_template_version: ocata
|
||||
|
||||
description: >
|
||||
OpenStack Octavia API service.
|
||||
|
||||
parameters:
|
||||
ServiceNetMap:
|
||||
default: {}
|
||||
description: Mapping of service_name -> network name. Typically set
|
||||
via parameter_defaults in the resource registry. This
|
||||
mapping overrides those in ServiceNetMapDefaults.
|
||||
type: json
|
||||
DefaultPasswords:
|
||||
default: {}
|
||||
type: json
|
||||
EndpointMap:
|
||||
default: {}
|
||||
description: Mapping of service endpoint -> protocol. Typically set
|
||||
via parameter_defaults in the resource registry.
|
||||
type: json
|
||||
OctaviaPassword:
|
||||
description: The password for the Octavia's database account.
|
||||
type: string
|
||||
hidden: true
|
||||
KeystoneRegion:
|
||||
type: string
|
||||
default: 'regionOne'
|
||||
description: Keystone region for endpoint
|
||||
MonitoringSubscriptionOctaviaApi:
|
||||
default: 'overcloud-octavia-api'
|
||||
type: string
|
||||
OctaviaApiLoggingSource:
|
||||
type: json
|
||||
default:
|
||||
tag: openstack.octavia.api
|
||||
path: /var/log/octavia/api.log
|
||||
|
||||
resources:
|
||||
|
||||
OctaviaBase:
|
||||
type: ./octavia-base.yaml
|
||||
properties:
|
||||
ServiceNetMap: {get_param: ServiceNetMap}
|
||||
DefaultPasswords: {get_param: DefaultPasswords}
|
||||
EndpointMap: {get_param: EndpointMap}
|
||||
|
||||
outputs:
|
||||
role_data:
|
||||
description: Role data for the Octavia API service.
|
||||
value:
|
||||
service_name: octavia_api
|
||||
monitoring_subscription: {get_param: MonitoringSubscriptionOctaviaApi}
|
||||
logging_source: {get_param: OctaviaApiLoggingSource}
|
||||
logging_groups:
|
||||
- octavia
|
||||
config_settings:
|
||||
map_merge:
|
||||
- get_attr: [OctaviaBase, role_data, config_settings]
|
||||
- octavia::keystone::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri] }
|
||||
octavia::db::database_connection:
|
||||
list_join:
|
||||
- ''
|
||||
- - {get_param: [EndpointMap, MysqlInternal, protocol]}
|
||||
- '://octavia:'
|
||||
- {get_param: OctaviaPassword}
|
||||
- '@'
|
||||
- {get_param: [EndpointMap, MysqlInternal, host]}
|
||||
- '/octavia'
|
||||
- '?bind_address='
|
||||
- "%{hiera('tripleo::profile::base::database::mysql::client_bind_address')}"
|
||||
octavia::keystone::authtoken::auth_url: {get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix]}
|
||||
octavia::keystone::authtoken::project_name: 'service'
|
||||
octavia::api::sync_db: true
|
||||
tripleo.octavia_api.firewall_rules:
|
||||
'120 octavia api':
|
||||
dport:
|
||||
- 9876
|
||||
- 13876
|
||||
octavia::host: {get_param: [ServiceNetMap, OctaviaApiNetwork]}
|
||||
step_config: |
|
||||
include tripleo::profile::base::octavia::api
|
||||
service_config_settings:
|
||||
keystone:
|
||||
octavia::keystone::auth::tenant: 'service'
|
||||
octavia::keystone::auth::public_url: {get_param: [EndpointMap, OctaviaPublic, uri]}
|
||||
octavia::keystone::auth::internal_url: { get_param: [ EndpointMap, OctaviaInternal, uri ] }
|
||||
octavia::keystone::auth::admin_url: { get_param: [ EndpointMap, OctaviaAdmin, uri ] }
|
||||
octavia::keystone::auth::password: {get_param: OctaviaPassword}
|
||||
octavia::keystone::auth::region: {get_param: KeystoneRegion}
|
||||
mysql:
|
||||
octavia::db::mysql::password: {get_param: OctaviaPassword}
|
||||
octavia::db::mysql::user: octavia
|
||||
octavia::db::mysql::host: {get_param: [EndpointMap, MysqlInternal, host_nobrackets]}
|
||||
octavia::db::mysql::dbname: octavia
|
||||
octavia::db::mysql::allowed_hosts:
|
||||
- '%'
|
||||
- "%{hiera('mysql_bind_host')}"
|
||||
62
puppet/services/octavia-base.yaml
Normal file
62
puppet/services/octavia-base.yaml
Normal file
@ -0,0 +1,62 @@
|
||||
heat_template_version: ocata
|
||||
|
||||
description: >
|
||||
OpenStack Octavia base service. Shared for all Octavia services
|
||||
|
||||
parameters:
|
||||
ServiceNetMap:
|
||||
default: {}
|
||||
description: Mapping of service_name -> network name. Typically set
|
||||
via parameter_defaults in the resource registry. This
|
||||
mapping overrides those in ServiceNetMapDefaults.
|
||||
type: json
|
||||
DefaultPasswords:
|
||||
default: {}
|
||||
type: json
|
||||
EndpointMap:
|
||||
default: {}
|
||||
description: Mapping of service endpoint -> protocol. Typically set
|
||||
via parameter_defaults in the resource registry.
|
||||
type: json
|
||||
Debug:
|
||||
type: string
|
||||
default: ''
|
||||
description: Set to True to enable debugging on all services.
|
||||
EnableConfigPurge:
|
||||
type: boolean
|
||||
default: true
|
||||
description: >
|
||||
Remove configuration that is not generated by TripleO. Setting
|
||||
to false may result in configuration remnants after updates/upgrades.
|
||||
RabbitPassword:
|
||||
description: The password for RabbitMQ
|
||||
type: string
|
||||
hidden: true
|
||||
RabbitUserName:
|
||||
default: guest
|
||||
description: The username for RabbitMQ
|
||||
type: string
|
||||
RabbitClientUseSSL:
|
||||
default: false
|
||||
description: >
|
||||
Rabbit client subscriber parameter to specify
|
||||
an SSL connection to the RabbitMQ host.
|
||||
type: string
|
||||
RabbitClientPort:
|
||||
default: 5672
|
||||
description: Set rabbit subscriber port, change this if using SSL
|
||||
type: number
|
||||
|
||||
outputs:
|
||||
role_data:
|
||||
description: Base role data for Octavia services
|
||||
value:
|
||||
service_name: octavia_base
|
||||
config_settings:
|
||||
octavia::debug: {get_param: Debug}
|
||||
octavia::purge_config: {get_param: EnableConfigPurge}
|
||||
octavia::rabbit_use_ssl: {get_param: RabbitClientUseSSL}
|
||||
tripleo::profile::base::octavia::rabbit_user: {get_param: RabbitUserName}
|
||||
tripleo::profile::base::octavia::rabbit_password: {get_param: RabbitPassword}
|
||||
tripleo::profile::base::octavia::rabbit_port: {get_param: RabbitClientPort}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user