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

@@ -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,6 +97,7 @@ if [ "$?" = '1' ]; then
     exit 1
 fi
 
+if [ -z "$UsingNovajoin" ]; then
     # Create undercloud host
     ipa host-add $UndercloudFQDN --password=$HostsSecret --force
 
@@ -102,3 +106,4 @@ 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