From 64f30b5b3cdc73129b4f986219906f411a826230 Mon Sep 17 00:00:00 2001 From: Juan Antonio Osorio Robles Date: Tue, 23 Oct 2018 13:28:30 +0300 Subject: [PATCH] Delete novajoin manual setup from freeipa setup script This is no longer needed, as the setup is done as part of the installation steps for novajoin. Change-Id: Iab76b924cfa569487ff557d30d767f7ec8680669 --- ci/scripts/freeipa_setup.sh | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/ci/scripts/freeipa_setup.sh b/ci/scripts/freeipa_setup.sh index 4815dd735a..7eda84b2ac 100644 --- a/ci/scripts/freeipa_setup.sh +++ b/ci/scripts/freeipa_setup.sh @@ -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