Skip to content

Commit

Permalink
data/bootstrap: update the mco bootstrap to include the cloudconf fil…
Browse files Browse the repository at this point in the history
…e path

Catching up to MCO supporting reading the cloud conf file on bootstrap node only when the infrastructures.config.openshift.io
has the cloud provider config location set [1]

[1]: openshift/machine-config-operator#591
  • Loading branch information
abhinavdahiya committed Apr 25, 2019
1 parent 5f91f75 commit 27846b4
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion data/data/bootstrap/files/usr/local/bin/bootkube.sh.template
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,8 @@ then
--machine-config-server-image=${MACHINE_CONFIG_SERVER_IMAGE} \
--machine-config-daemon-image=${MACHINE_CONFIG_DAEMON_IMAGE} \
--machine-config-oscontent-image=${MACHINE_CONFIG_OSCONTENT} \
--infra-image=${MACHINE_CONFIG_INFRA_IMAGE}
--infra-image=${MACHINE_CONFIG_INFRA_IMAGE} \
--cloud-config-file=/assets/manifests/cloud-provider-config.yaml

# Bootstrap MachineConfigController uses /etc/mcc/bootstrap/manifests/ dir to
# 1. read the controller config rendered by MachineConfigOperator
Expand Down

0 comments on commit 27846b4

Please sign in to comment.