Skip to content

Commit

Permalink
Demonstrate installer early exit is not necessary.
Browse files Browse the repository at this point in the history
The only remaining change we have running after exiting early from the
install process is adding IPs to the master Machines.  This is to
enable auto approval of CSRs.  We also have a cron job that does this,
so it's not necessary to do this in the middle of the install.  The
change moves it to post-install.

Related issues:
  openshift-metal3/kni-installer#60
  openshift-metal3#260
  metal3-io/baremetal-operator#242
  • Loading branch information
russellb committed Jul 5, 2019
1 parent 588ad42 commit 75b8a03
Showing 1 changed file with 8 additions and 5 deletions.
13 changes: 8 additions & 5 deletions 06_create_cluster.sh
Expand Up @@ -72,9 +72,15 @@ sudo systemd-run --on-active=30s --on-unit-active=1m --unit=fix_certs.service $(
# Call kni-installer to deploy the bootstrap node and masters
create_cluster ocp

echo "Master nodes up, you can ssh to the following IPs with core@<IP>"
sudo virsh net-dhcp-leases baremetal
# TODO: remove this once the early exit is dropped from the installer
wait_for_cvo_finish ocp
echo "Cluster up, you can interact with it via oc --config ${KUBECONFIG} <command>"

# The deployment is complete, but we must manually add the IPs for the masters,
# as we don't have a way to do that automatically yet. This is required for
# CSRs to get auto approved for masters.
# https://github.com/openshift-metal3/dev-scripts/issues/260
# https://github.com/metal3-io/baremetal-operator/issues/242
./add-machine-ips.sh

# Bounce the machine approver to get it to notice the changes.
Expand All @@ -90,6 +96,3 @@ oc scale deployment -n openshift-cluster-machine-approver --replicas=1 machine-a
sleep 5
oc get csr
# END Hack

wait_for_cvo_finish ocp
echo "Cluster up, you can interact with it via oc --config ${KUBECONFIG} <command>"

0 comments on commit 75b8a03

Please sign in to comment.