diff --git a/install-from-bastion.sh b/install-from-bastion.sh index bb2138c..9bc0a9b 100644 --- a/install-from-bastion.sh +++ b/install-from-bastion.sh @@ -19,8 +19,8 @@ git clone -b release-3.9 https://github.com/openshift/openshift-ansible # git clone -b release-3.6 https://github.com/openshift/openshift-ansible # Run the playbook. -ANSIBLE_HOST_KEY_CHECKING=False ansible-playbook -i ./inventory.cfg ./openshift-ansible/playbooks/prerequisites.yml -ANSIBLE_HOST_KEY_CHECKING=False ansible-playbook -i ./inventory.cfg ./openshift-ansible/playbooks/deploy_cluster.yml +ANSIBLE_HOST_KEY_CHECKING=False /usr/local/bin/ansible-playbook -i ./inventory.cfg ./openshift-ansible/playbooks/prerequisites.yml +ANSIBLE_HOST_KEY_CHECKING=False /usr/local/bin/ansible-playbook -i ./inventory.cfg ./openshift-ansible/playbooks/deploy_cluster.yml # If needed, uninstall with the below: # ansible-playbook playbooks/adhoc/uninstall.yml diff --git a/inventory.template.cfg b/inventory.template.cfg index 48aa7ab..77dcbc4 100644 --- a/inventory.template.cfg +++ b/inventory.template.cfg @@ -42,16 +42,6 @@ openshift_cloudprovider_aws_secret_key=${secret_key} # Set the cluster_id. openshift_clusterid=${cluster_id} -# - https://github.com/openshift/openshift-ansible/issues/5534 -# - https://github.com/openshift/openshift-ansible/issues/6087 -# - https://github.com/coreos/etcd/issues/8603#issuecomment-341508947 -# etcd_version=3.1.9 -# etcd_version=3.2.7 -# osm_cluster_network_cidr=11.0.0.0/16 -openshift_enable_service_catalog=false -template_service_broker_install=false -openshift_repos_enable_testing=true - # Create the masters host group. Note that due do: # https://github.com/dwmkerr/terraform-aws-openshift/issues/40 # We cannot use the internal DNS names (such as master.openshift.local) as there