Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove downloading of inventory and add clusters #181

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Remove downloading of inventory and add clusters #181

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 21 additions & 2 deletions install-openshift.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,16 @@ if [ "$INTERACTIVE" = "true" ]; then
if [ "$choice" != "" ] ; then
export API_PORT="$choice";
fi

echo "Do you wish to setup this server as a cluster?"
echo "Warnings: "
echo " This will not install openshift. Only the requirements needed to run as a cluster."
select yn in "Yes" "No"; do
case $yn in
Yes) export CLUSTER=true; break;;
No) export CLUSTER=false; break;;
*) echo "Please select Yes or No.";;
esac
done
echo "Do you wish to enable HTTPS with Let's Encrypt?"
echo "Warnings: "
echo " Let's Encrypt only works if the IP is using publicly accessible IP and custom certificates."
Expand Down Expand Up @@ -100,6 +109,7 @@ echo "* Your username is $USERNAME "
echo "* Your password is $PASSWORD "
echo "* OpenShift version: $VERSION "
echo "* Enable HTTPS with Let's Encrypt: $LETSENCRYPT "
echo "* Cluster initial install only?: $CLUSTER "
if [ "$LETSENCRYPT" = true ] ; then
echo "* Your email is $MAIL "
fi
Expand Down Expand Up @@ -181,8 +191,11 @@ fi
if [ "$memory" -lt "16777216" ]; then
export LOGGING="False"
fi
if [ "$CLUSTER" = false ] ; then
#curl -o inventory.download $SCRIPT_REPO/inventory.ini
cp inventory.ini inventory.download


curl -o inventory.download $SCRIPT_REPO/inventory.ini
envsubst < inventory.download > inventory.ini

# add proxy in inventory.ini if proxy variables are set
Expand Down Expand Up @@ -308,3 +321,9 @@ echo "$ oc login -u ${USERNAME} -p ${PASSWORD} https://console.$DOMAIN:$API_PORT
echo "******"

oc login -u ${USERNAME} -p ${PASSWORD} https://console.$DOMAIN:$API_PORT/
else
echo "******"
echo "* This server can now be added as an openshift cluster"
echo "* Please update the inventory file on the master server"
echo "******"
fi