diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-02-13 11:18:19 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-02-13 11:18:19 +0000 |
| commit | 369c11edd6be4c3964570003f4aa4642e6cf3608 (patch) | |
| tree | 0fb5840d004d1d117676846c9a56e96f5c370edd | |
| parent | e6a88afa04cde189cd0e7d119a51b5667c3e69da (diff) | |
| parent | f6d8dc6e39ca6950ea7d1252e3a13d02eb8c57ec (diff) | |
Merge "FreeIPA: don't preprovision service principals if novajoin is enabled"
| -rw-r--r-- | ci/scripts/freeipa_setup.sh | 19 |
1 files changed, 12 insertions, 7 deletions
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 |