Merge "Expose parameter MistralDockerGroup"

This commit is contained in:
Zuul 2018-05-15 12:07:10 +00:00 committed by Gerrit Code Review
commit 9d9bd244f7
3 changed files with 7 additions and 0 deletions

View File

@ -30,3 +30,4 @@ resource_registry:
parameter_defaults:
ZaqarMessageStore: 'swift'
ZaqarManagementStore: 'sqlalchemy'
MistralDockerGroup: true

View File

@ -100,3 +100,4 @@ parameter_defaults:
DhcpRangeStart: '192.168.24.5'
DhcpRangeEnd: '192.168.24.24'
UndercloudCtlplaneLocalSubnet: 'ctlplane-subnet'
MistralDockerGroup: true

View File

@ -45,6 +45,10 @@ parameters:
description: The password for the Mistral service and db account, used by the Mistral services.
type: string
hidden: true
MistralDockerGroup:
default: false
description: Add the mistral user to the docker group to allow actions to perform docker operations.
type: boolean
KeystoneRegion:
type: string
default: 'regionOne'
@ -117,6 +121,7 @@ outputs:
- ''
- - {get_param: [EndpointMap, KeystoneV3Internal, uri]}
- '/ec2tokens'
tripleo::profile::base::mistral::executor::docker_group: {get_param: MistralDockerGroup}
service_config_settings:
keystone:
mistral::keystone::auth::tenant: 'service'