Fix enabled tripleo-validations check

With the move from instack-undercloud to containerized undercloud, the
hiera key to check for whether the tripleo-validations are enabled
changed from `enable_validations` to `tripleo_validations_enabled`. This
commit updated the check in undercloud_post.sh to use the right key. It
also removed the useless EnableValidation heat param.

Change-Id: I338e139fa770ebb7bdcc1c0afb79eec062fada8b
This commit is contained in:
Martin André 2018-08-09 13:35:07 +03:00
parent d02cef42d0
commit e60f836de4
2 changed files with 1 additions and 8 deletions

View File

@ -136,7 +136,7 @@ if [ "$(hiera mistral_api_enabled)" = "true" ]; then
openstack workflow env create $TMP_MISTRAL_ENV
fi
if [ "$(hiera enable_validations)" = "true" ]; then
if [ "$(hiera tripleo_validations_enabled)" = "true" ]; then
echo Execute copy_ssh_key validations
openstack workflow execution create tripleo.validations.v1.copy_ssh_key

View File

@ -37,11 +37,6 @@ parameters:
description: The user password for SNMPd with readonly rights running on all Overcloud nodes
type: string
hidden: true
EnableValidations:
default: false
description: >
Whether the TripleO validations are enabled.
type: boolean
DnsServers:
default: []
description: >
@ -104,7 +99,6 @@ resources:
- name: admin_password
- name: auth_url
- name: snmp_readonly_user_password
- name: enable_validations
- name: internal_tls_ca_file
config: {get_file: ./undercloud_post.sh}
@ -119,7 +113,6 @@ resources:
homedir: {get_param: UndercloudHomeDir}
admin_password: {get_param: AdminPassword}
snmp_readonly_user_password: {get_param: SnmpdReadonlyUserPassword}
enable_validations: {get_param: EnableValidations}
internal_tls_ca_file:
if:
- ca_file_enabled