diff --git a/cmd/clusterctl/configuration/ibmcloud/scripts/launcher.sh b/cmd/clusterctl/configuration/ibmcloud/scripts/launcher.sh deleted file mode 100755 index fe9c86444..000000000 --- a/cmd/clusterctl/configuration/ibmcloud/scripts/launcher.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/bash - -set -x - -USER_DATA_PATH=ibm_cloud_data -USER_DATA_FILE=${USER_DATA_PATH}/openstack/latest/user_data -mkdir ibm_cloud_data -if [ $? -ne 0 ]; then - echo "Failed creating directory ${USER_DATA_PATH} under `pwd`." - exit -1 -fi - -mount /dev/xvdh1 ibm_cloud_data/ -if [ $? -ne 0 ]; then - echo "Failed mounting /dev/xvdh1 to `pwd`/${USER_DATA_PATH}." - exit -1 -fi - -if [ ! -f "${USER_DATA_FILE}" ];then - echo "Failed mounting /dev/xvdh1 to `pwd`/${USER_DATA_PATH}." - exit -1 -fi - -#base64 -d ibm_cloud_data/openstack/latest/user_data > ~/deployk8s.sh -cp ibm_cloud_data/openstack/latest/user_data /deployk8s.sh - -# IBM cloud runs executable files automatically based on test -# To ensure the file is executed, explicitly run it - -bash -x /deployk8s.sh diff --git a/pkg/cloud/ibmcloud/clients/machines.go b/pkg/cloud/ibmcloud/clients/machines.go index 1cb02968b..cf00d992a 100644 --- a/pkg/cloud/ibmcloud/clients/machines.go +++ b/pkg/cloud/ibmcloud/clients/machines.go @@ -103,8 +103,6 @@ func (gs *GuestService) GuestCreate(clusterName, hostName, sshKeyName, userScrip } klog.Infof("Got SSH key %q with id %d\n", sshKeyName, keyId) - // TODO: remove this hardcoded path if we know how to execute userData as a script directly - scriptURL := "https://raw.githubusercontent.com/multicloudlab/cluster-api-provider-ibmcloud/master/cmd/clusterctl/configuration/ibmcloud/scripts/launcher.sh" userData := []datatypes.Virtual_Guest_Attribute{ { // TODO: if base64 needed @@ -129,7 +127,6 @@ func (gs *GuestService) GuestCreate(clusterName, hostName, sshKeyName, userScrip HourlyBillingFlag: sl.Bool(true), SshKeyCount: sl.Uint(1), SshKeys: sshKeys, - PostInstallScriptUri: sl.String(scriptURL), UserData: userData, }