openstack/tripleo-heat-templates
Code Issues Proposed changes

Add a FreeIPAExtraArgs param to ci/scripts/freeipa_setup.sh

Browse Source 
There are scripts that need some customized parameters (infrared
uses freeipa_setup.sh for example). And sometimes it is convenient
to be able to disable dns verification for example.

Change-Id: Ie605aade96dc690e6b52f55bdf1526c8fd51de6c
This commit is contained in:
Michele Baldessari 2018-08-16 19:55:00 +02:00
parent 33cc06fae1
commit d2da6c8ac6
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ci/scripts/freeipa_setup.sh
View File

@ -13,6 +13,7 @@
# - UsingNovajoin: If unset, we pre-provision the service principals # - UsingNovajoin: If unset, we pre-provision the service principals
# needed for the overcloud deploy. If set, we skip this, # needed for the overcloud deploy. If set, we skip this,
# since novajoin will do it. # since novajoin will do it.
# - FreeIPAExtraArgs: Additional parameters to be passed to FreeIPA script
# #
set -eux set -eux
@ -30,6 +31,7 @@ export UndercloudFQDN=${UndercloudFQDN:-""}
export HostsSecret=${HostsSecret:-""} export HostsSecret=${HostsSecret:-""}
export ProvisioningCIDR=${ProvisioningCIDR:-""} export ProvisioningCIDR=${ProvisioningCIDR:-""}
export UsingNovajoin=${UsingNovajoin:-""} export UsingNovajoin=${UsingNovajoin:-""}
export FreeIPAExtraArgs=${FreeIPAExtraArgs:-""}
if [ -n "$ProvisioningCIDR" ]; then if [ -n "$ProvisioningCIDR" ]; then
# Add address to provisioning network interface # Add address to provisioning network interface
@ -96,7 +98,7 @@ ipa-server-install -U -r `hostname -d|tr "[a-z]" "[A-Z]"` \
-p $DirectoryManagerPassword -a $AdminPassword \ -p $DirectoryManagerPassword -a $AdminPassword \
--hostname `hostname -f` \ --hostname `hostname -f` \
--ip-address=$FreeIPAIP \ --ip-address=$FreeIPAIP \
--setup-dns --auto-forwarders --auto-reverse --setup-dns --auto-forwarders --auto-reverse $FreeIPAExtraArgs
# Authenticate # Authenticate
echo $AdminPassword | kinit admin echo $AdminPassword | kinit admin