Merge "Override policy for undercloud novajoin"

This commit is contained in:
Zuul 2019-11-07 01:59:37 +00:00 committed by Gerrit Code Review
commit aff1b2ba49
2 changed files with 12 additions and 0 deletions

View File

@ -78,6 +78,11 @@ parameters:
description: The timeout for both the vendordata dynamic connect and read description: The timeout for both the vendordata dynamic connect and read
values. values.
type: number type: number
NovajoinPolicies:
description: |
A hash of policies to configure for Novajoin.
default: {}
type: json
resources: resources:
@ -117,6 +122,7 @@ outputs:
'119 novajoin': '119 novajoin':
dport: dport:
- 9090 - 9090
nova::metadata::novajoin::policy::policies: {get_param: NovajoinPolicies}
service_config_settings: service_config_settings:
keystone: keystone:
nova::metadata::novajoin::auth::tenant: 'service' nova::metadata::novajoin::auth::tenant: 'service'

View File

@ -94,6 +94,12 @@ parameter_defaults:
NovaAutoDisabling: '0' NovaAutoDisabling: '0'
NovaCorsAllowedOrigin: '*' NovaCorsAllowedOrigin: '*'
NovaSyncPowerStateInterval: -1 NovaSyncPowerStateInterval: -1
# Overwrite compute_server_user policy to allow any user with role admin
# to post to novajoin (required for mistral workflow)
NovajoinPolicies:
compute_service_user:
key: 'compute_service_user'
value: 'role:admin'
NeutronDhcpAgentsPerNetwork: 2 NeutronDhcpAgentsPerNetwork: 2
HeatConvergenceEngine: true HeatConvergenceEngine: true
HeatCorsAllowedOrigin: '*' HeatCorsAllowedOrigin: '*'