openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Delete novajoin manual setup from freeipa setup script"

Browse Source
This commit is contained in:
Zuul 2018-10-24 16:08:08 +00:00 committed by Gerrit Code Review
commit 796c8ce35a
1 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ci/scripts/freeipa_setup.sh
View File

@ -10,9 +10,6 @@
# - HostsSecret
# - ProvisioningCIDR: If set, it adds the given CIDR to the provisioning
# interface (which is hardcoded to eth1)
# - UsingNovajoin: If unset, we pre-provision the service principals
# needed for the overcloud deploy. If set, we skip this,
# since novajoin will do it.
# - FreeIPAExtraArgs: Additional parameters to be passed to FreeIPA script
#
set -eux
@ -30,7 +27,6 @@ export AdminPassword=${AdminPassword:-""}
export UndercloudFQDN=${UndercloudFQDN:-""}
export HostsSecret=${HostsSecret:-""}
export ProvisioningCIDR=${ProvisioningCIDR:-""}
export UsingNovajoin=${UsingNovajoin:-""}
export FreeIPAExtraArgs=${FreeIPAExtraArgs:-""}
if [ -n "$ProvisioningCIDR" ]; then
@ -109,14 +105,3 @@ klist
if [ "$?" = '1' ]; then
exit 1
fi
if [ -z "$UsingNovajoin" ]; then
# Create undercloud host
ipa host-add $UndercloudFQDN --password=$HostsSecret --force
# Create overcloud nodes and services
git clone https://github.com/JAORMX/freeipa-tripleo-incubator.git
cd freeipa-tripleo-incubator
python create_ipa_tripleo_host_setup.py -w $HostsSecret -d $(hostname -d) \
--controller-count 1 --compute-count 1
fi