From f6d8dc6e39ca6950ea7d1252e3a13d02eb8c57ec Mon Sep 17 00:00:00 2001
From: Juan Antonio Osorio Robles <jaosorior@redhat.com>
Date: Wed, 1 Feb 2017 01:21:09 +0200
Subject: FreeIPA: don't preprovision service principals if novajoin is enabled

novajoin will do this once it's enabled in CI.

Change-Id: I9f19d833f306930704b09de0c4d425461f1f3f63
---
 ci/scripts/freeipa_setup.sh | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

(limited to 'ci/scripts/freeipa_setup.sh')

diff --git a/ci/scripts/freeipa_setup.sh b/ci/scripts/freeipa_setup.sh
index a36493a1..c9a5cba2 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
-- 
cgit 1.2.3-korg