openstack/tripleo-heat-templates
Code Issues Proposed changes

Delete novajoin manual setup from freeipa setup script

Browse Source 
This is no longer needed, as the setup is done as part of the
installation steps for novajoin.

Change-Id: Iab76b924cfa569487ff557d30d767f7ec8680669
This commit is contained in:
Juan Antonio Osorio Robles 2018-10-23 13:28:30 +03:00
parent df431ad344
commit 64f30b5b3c
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 # - HostsSecret
# - ProvisioningCIDR: If set, it adds the given CIDR to the provisioning # - ProvisioningCIDR: If set, it adds the given CIDR to the provisioning
# interface (which is hardcoded to eth1) # 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 # - FreeIPAExtraArgs: Additional parameters to be passed to FreeIPA script
# #
set -eux set -eux
@ -30,7 +27,6 @@ export AdminPassword=${AdminPassword:-""}
export UndercloudFQDN=${UndercloudFQDN:-""} export UndercloudFQDN=${UndercloudFQDN:-""}
export HostsSecret=${HostsSecret:-""} export HostsSecret=${HostsSecret:-""}
export ProvisioningCIDR=${ProvisioningCIDR:-""} export ProvisioningCIDR=${ProvisioningCIDR:-""}
export UsingNovajoin=${UsingNovajoin:-""}
export FreeIPAExtraArgs=${FreeIPAExtraArgs:-""} export FreeIPAExtraArgs=${FreeIPAExtraArgs:-""}
if [ -n "$ProvisioningCIDR" ]; then if [ -n "$ProvisioningCIDR" ]; then
@ -109,14 +105,3 @@ klist
if [ "$?" = '1' ]; then if [ "$?" = '1' ]; then
exit 1 exit 1
fi 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