Merge "Rename AdminToken to KeystonePassword"
This commit is contained in:
commit
670f23bf49
|
@ -120,8 +120,9 @@ parameters:
|
||||||
description: >
|
description: >
|
||||||
Set to true to enable the SQLAlchemy-collectd server plugin
|
Set to true to enable the SQLAlchemy-collectd server plugin
|
||||||
default: false
|
default: false
|
||||||
AdminToken:
|
KeystonePassword:
|
||||||
description: The keystone auth secret and db password.
|
description: The password for the nova service and db account
|
||||||
|
default: ''
|
||||||
type: string
|
type: string
|
||||||
hidden: true
|
hidden: true
|
||||||
TokenExpiration:
|
TokenExpiration:
|
||||||
|
@ -361,6 +362,21 @@ parameters:
|
||||||
RootStackName:
|
RootStackName:
|
||||||
description: The name of the stack/plan.
|
description: The name of the stack/plan.
|
||||||
type: string
|
type: string
|
||||||
|
AdminToken:
|
||||||
|
description: The password for the keystone admin account, used for monitoring, querying neutron etc.
|
||||||
|
default: ''
|
||||||
|
type: string
|
||||||
|
hidden: true
|
||||||
|
|
||||||
|
parameter_groups:
|
||||||
|
- label: deprecated
|
||||||
|
description: |
|
||||||
|
The following parameters are deprecated and will be removed. They should not
|
||||||
|
be relied on for new deployments. If you have concerns regarding deprecated
|
||||||
|
parameters, please contact the TripleO development team on IRC or the
|
||||||
|
OpenStack mailing list.
|
||||||
|
parameters:
|
||||||
|
- AdminToken
|
||||||
|
|
||||||
resources:
|
resources:
|
||||||
ContainersCommon:
|
ContainersCommon:
|
||||||
|
@ -412,6 +428,7 @@ conditions:
|
||||||
password_regex_description_set: {not: {equals: [{get_param: KeystonePasswordRegexDescription}, '']}}
|
password_regex_description_set: {not: {equals: [{get_param: KeystonePasswordRegexDescription}, '']}}
|
||||||
unique_last_password_count_set: {not: {equals: [{get_param: KeystoneUniqueLastPasswordCount}, '']}}
|
unique_last_password_count_set: {not: {equals: [{get_param: KeystoneUniqueLastPasswordCount}, '']}}
|
||||||
cors_allowed_origin_set: {not: {equals : [{get_param: KeystoneCorsAllowedOrigin}, '']}}
|
cors_allowed_origin_set: {not: {equals : [{get_param: KeystoneCorsAllowedOrigin}, '']}}
|
||||||
|
admin_token_set: {not: {equals: [{get_param: AdminToken}, '']}}
|
||||||
|
|
||||||
outputs:
|
outputs:
|
||||||
role_data:
|
role_data:
|
||||||
|
@ -435,7 +452,11 @@ outputs:
|
||||||
make_url:
|
make_url:
|
||||||
scheme: {get_param: [EndpointMap, MysqlInternal, protocol]}
|
scheme: {get_param: [EndpointMap, MysqlInternal, protocol]}
|
||||||
username: keystone
|
username: keystone
|
||||||
password: {get_param: AdminToken}
|
password:
|
||||||
|
if:
|
||||||
|
- admin_token_set
|
||||||
|
- {get_param: AdminToken}
|
||||||
|
- {get_param: KeystonePassword}
|
||||||
host: {get_param: [EndpointMap, MysqlInternal, host]}
|
host: {get_param: [EndpointMap, MysqlInternal, host]}
|
||||||
path: /keystone
|
path: /keystone
|
||||||
query:
|
query:
|
||||||
|
@ -598,7 +619,11 @@ outputs:
|
||||||
rsyslog:
|
rsyslog:
|
||||||
tripleo_logging_sources_keystone: {get_param: KeystoneLoggingSource}
|
tripleo_logging_sources_keystone: {get_param: KeystoneLoggingSource}
|
||||||
mysql:
|
mysql:
|
||||||
keystone::db::mysql::password: {get_param: AdminToken}
|
keystone::db::mysql::password:
|
||||||
|
if:
|
||||||
|
- admin_token_set
|
||||||
|
- {get_param: AdminToken}
|
||||||
|
- {get_param: KeystonePassword}
|
||||||
keystone::db::mysql::user: keystone
|
keystone::db::mysql::user: keystone
|
||||||
keystone::db::mysql::host: {get_param: [EndpointMap, MysqlInternal, host_nobrackets]}
|
keystone::db::mysql::host: {get_param: [EndpointMap, MysqlInternal, host_nobrackets]}
|
||||||
keystone::db::mysql::dbname: keystone
|
keystone::db::mysql::dbname: keystone
|
||||||
|
|
|
@ -0,0 +1,5 @@
|
||||||
|
---
|
||||||
|
deprecations:
|
||||||
|
- |
|
||||||
|
The ``AdminToken`` parameter has been deprecated.
|
||||||
|
Use the new ``KeystonePassword`` parameter instead.
|
Loading…
Reference in New Issue