consolidate variable undercloud_enable_novajoin to common

Depends-On: https://review.opendev.org/#/c/754408/
Change-Id: I440694d19286a0802f42f8e1cbd298dbda6ed903
This commit is contained in:
Wes Hayutin 2020-09-24 15:38:15 -06:00 committed by wes hayutin
parent cb6ab4eeed
commit 9260bdfa3a
4 changed files with 1 additions and 3 deletions

View File

@ -71,6 +71,7 @@ additional_insecure_registry: false
deployed_server: false
overcloud_templates_path: /usr/share/openstack-tripleo-heat-templates
enable_tls_everywhere: false
undercloud_enable_novajoin: true
undercloud_generate_service_certificate: true
undercloud_network_cidr: 192.168.24.0/24
undercloud_undercloud_nameservers:

View File

@ -8,5 +8,4 @@ supplemental_user: "stack"
freeipa_subcas: []
prepare_ipa: true
# location which the novajoin-ipa-setup will store the FreeIPA token
undercloud_enable_novajoin: true
freeipa_otp_key: /tmp/ipa-otp.txt

View File

@ -91,7 +91,6 @@ use_resource_registry_nic_configs: false
ssl_args: ""
tls_everywhere_args: ""
undercloud_enable_novajoin: true
validation_args: "--validation-warnings-fatal"
enable_swap: false

View File

@ -37,7 +37,6 @@ undercloud_ironic_ipxe_port: 3816
undercloud_conf_extra: ""
undercloud_enable_novajoin: true
prepare_ipa: true
# location which the novajoin-ipa-setup will store the FreeIPA token