openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Include the DB password in a Mistral environment for creating backups and restores"

This commit is contained in:
Zuul 2019-02-02 02:48:02 +00:00 committed by Gerrit Code Review
parent db37eba7b0 166803d05f
commit a23598c413
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
extraconfig/post_deploy/undercloud_post.py
View File

@ -112,12 +112,14 @@ def _create_logging_cron(mistral):
print('INFO: Undercloud post - Cron triggers configured successfully.')
def _store_snmp_password_in_mistral_env(mistral):
""" Store the SNMP password in a mistral environment """
def _store_passwords_in_mistral_env(mistral):
""" Store required passwords in a mistral environment """
env_name = 'tripleo.undercloud-config'
config_data = {
'undercloud_ceilometer_snmpd_password':
CONF['snmp_readonly_user_password']
CONF['snmp_readonly_user_password'],
'undercloud_db_password':
CONF['undercloud_db_password']
}
try:
mistral.environments.get(env_name).variables
@ -179,7 +181,7 @@ try:
session=sdk.session)
_configure_wrokbooks_and_workflows(mistral)
_create_logging_cron(mistral)
_store_snmp_password_in_mistral_env(mistral)
_store_passwords_in_mistral_env(mistral)
_create_default_plan(mistral)
if tripleo_validations_enabled:
_prepare_ssh_environment(mistral)

5
extraconfig/post_deploy/undercloud_post.yaml
View File

@ -37,6 +37,10 @@ parameters:
description: The user password for SNMPd with readonly rights running on all Overcloud nodes
type: string
hidden: true
MysqlRootPassword:
type: string
hidden: true
default: ''
DnsServers:
default: []
description: >
@ -212,6 +216,7 @@ resources:
cloud_name: {get_param: UndercloudCloudName}
home_dir: {get_param: UndercloudHomeDir}
snmp_readonly_user_password: {get_param: SnmpdReadonlyUserPassword}
undercloud_db_password: {get_param: MysqlRootPassword}
UndercloudCtlplaneNetworkConfig: