Merge pull request #1089 from joekr/fix-oci-build-on-linux

fix: update OCI to work on ubuntu and ensure windows tool
kubernetes-sigs · Mar 3, 2023 · 6e7fa1e · 6e7fa1e
2 parents 54663df + 2e42a2a
commit 6e7fa1e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/images/capi/Makefile b/images/capi/Makefile
@@ -117,6 +117,7 @@ deps-oci: ## Installs/checks dependencies for OCI builds
 deps-oci:
 	hack/ensure-ansible.sh
 	hack/ensure-packer.sh
+	hack/ensure-ansible-windows.sh
 	packer plugins install github.com/hashicorp/oracle
 
 .PHONY: deps-vbox

diff --git a/images/capi/packer/oci/scripts/set_bootstrap.sh b/images/capi/packer/oci/scripts/set_bootstrap.sh
@@ -22,6 +22,4 @@ set -o pipefail
 
 echo "Changing Password in winrm_bootstrap.txt"
 
-cp packer/oci/scripts/winrm_bootstrap_template.txt packer/oci/scripts/winrm_bootstrap.txt
-
-sed "s/(\[adsi\].*/([adsi](\"WinNT:\/\/\"+\$opcUser.caption).replace(\"\\\\\",\"\/\")).SetPassword(\"$OPC_USER_PASSWORD\")/g" packer/oci/scripts/winrm_bootstrap.txt | tee packer/oci/scripts/winrm_bootstrap.txt >/dev/null
+sed "s/(\[adsi\].*/([adsi](\"WinNT:\/\/\"+\$opcUser.caption).replace(\"\\\\\",\"\/\")).SetPassword(\"$OPC_USER_PASSWORD\")/g" packer/oci/scripts/winrm_bootstrap_template.txt | tee packer/oci/scripts/winrm_bootstrap.txt >/dev/null