Skip to content

Commit

Permalink
chore: remove old config for testing 3.7, fix ansible playbook path
Browse files Browse the repository at this point in the history
  • Loading branch information
dwmkerr committed May 1, 2018
1 parent 92f3e1a commit fa3f733
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 12 deletions.
4 changes: 2 additions & 2 deletions install-from-bastion.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
10 changes: 0 additions & 10 deletions inventory.template.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit fa3f733

Please sign in to comment.