Skip to content
Merged
Changes from all commits
Commits
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
22 changes: 2 additions & 20 deletions 06_deploy_bootstrap_vm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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: {}
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, yeah, good catch - the URI is there because I was originally trying to use the openshift-install libvirt backend to launch the bootstrap vm via "create cluster", but it turns out evern with replicas:null it still builds a single master node as well.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

While we're on this lets change this to platform: none - it should be the same as libvirt, but later on we change it for baremetal use cases

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tried this and you need to do:

platform:
  none: {}

Just setting platform to either null or the string none doesn't work, there's a json marshalling error from openshift-install

pullSecret: |
${PULL_SECRET}
sshKey: |
Expand Down