aboutsummaryrefslogtreecommitdiffstats
path: root/ci/scripts
diff options
context:
space:
mode:
authorJuan Antonio Osorio Robles <jaosorior@redhat.com>2017-02-01 01:21:09 +0200
committerJuan Antonio Osorio Robles <jaosorior@redhat.com>2017-02-01 19:15:41 +0000
commitf6d8dc6e39ca6950ea7d1252e3a13d02eb8c57ec (patch)
treed0df8014370f6619304983dae8224fb93a478f3b /ci/scripts
parenta81ccd80db07571a8b094b905112935bc42b4b7f (diff)
FreeIPA: don't preprovision service principals if novajoin is enabled
novajoin will do this once it's enabled in CI. Change-Id: I9f19d833f306930704b09de0c4d425461f1f3f63
Diffstat (limited to 'ci/scripts')
-rw-r--r--ci/scripts/freeipa_setup.sh19
1 files changed, 12 insertions, 7 deletions
diff --git a/ci/scripts/freeipa_setup.sh b/ci/scripts/freeipa_setup.sh
index a36493a..c9a5cba 100644
--- a/ci/scripts/freeipa_setup.sh
+++ b/ci/scripts/freeipa_setup.sh
@@ -10,6 +10,9 @@
# - 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.
#
set -eux
@@ -94,11 +97,13 @@ if [ "$?" = '1' ]; then
exit 1
fi
-# Create undercloud host
-ipa host-add $UndercloudFQDN --password=$HostsSecret --force
+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
+ # 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