From 805beac3e9ff07e0affc40e16f6ab857fcfe74a6 Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Wed, 20 Feb 2019 10:15:48 +0000 Subject: [PATCH] Update install-config Update to v1beta3 install-config.yaml Use the defaults for everything except the pieces of information that are required or that we want to override. We were setting the machine pool replicas to null to try and get "create cluster" to launch a bootstrap VM but no masters. According to the "FIXME: this doesn't work", it looks like we're not depending on this right now. The connection URI isn't actually used for generating ignition configs. --- 06_deploy_bootstrap_vm.sh | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/06_deploy_bootstrap_vm.sh b/06_deploy_bootstrap_vm.sh index 6e7e04fd7..e62045b1d 100755 --- a/06_deploy_bootstrap_vm.sh +++ b/06_deploy_bootstrap_vm.sh @@ -13,30 +13,12 @@ source utils.sh if [ ! -d ocp ]; then mkdir -p ocp cat > ocp/install-config.yaml << EOF -apiVersion: v1beta1 +apiVersion: v1beta3 baseDomain: ${BASE_DOMAIN} -machines: -- name: master - platform: {} - replicas: null -- name: worker - platform: {} - replicas: null metadata: - creationTimestamp: null name: ${CLUSTER_NAME} -networking: - clusterNetworks: - - cidr: 10.128.0.0/14 - hostSubnetLength: 9 - machineCIDR: 192.168.126.0/24 - serviceCIDR: 172.30.0.0/16 - type: OpenshiftSDN platform: - libvirt: - URI: qemu:///system - network: - if: tt0 + libvirt: {} pullSecret: | ${PULL_SECRET} sshKey: |