openstack
/
tripleo-quickstart-extras
Code Issues Proposed changes

Merge "consolidate variable undercloud_enable_novajoin to common"

This commit is contained in:
Zuul 2020-09-28 20:07:49 +00:00 committed by Gerrit Code Review
parent 76f4fed126 9260bdfa3a
commit 0f94b2b636
4 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
roles/extras-common/defaults/main.yml
View File

@ -81,6 +81,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:

1
roles/freeipa-setup/defaults/main.yml
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

1
roles/overcloud-deploy/defaults/main.yml
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

1
roles/undercloud-deploy/defaults/main.yml
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