From 3ef4bbf113c49dc5b9aac3db7bb15fcf03f8aa5d Mon Sep 17 00:00:00 2001 From: Ali Mukadam Date: Mon, 4 May 2020 11:54:40 +1000 Subject: [PATCH] removed and tested dependency on ip.finish (#156) Signed-off-by: Ali Mukadam --- .gitignore | 2 ++ modules/oke/kubeconfig.tf | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 2c902c1b..8d65b1c3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,8 @@ # Local .terraform directories **/.terraform/* +provider.tf + # .tfstate files *.tfstate *.tfstate.* diff --git a/modules/oke/kubeconfig.tf b/modules/oke/kubeconfig.tf index 3e8f6077..d3ab01d1 100644 --- a/modules/oke/kubeconfig.tf +++ b/modules/oke/kubeconfig.tf @@ -58,7 +58,7 @@ resource "null_resource" "install_kubectl_admin" { count = var.oke_admin.bastion_enabled == true && var.oke_admin.admin_enabled == true ? 1 : 0 } -# wait for 1. admin being ready 2. instance_principal created 3. kubectl is installed (the script will create the .kube directory) +# wait for 1. admin being ready 2. kubectl is installed (the script will create the .kube directory) resource null_resource "wait_for_admin" { connection { host = var.oke_admin.admin_private_ip @@ -76,7 +76,7 @@ resource null_resource "wait_for_admin" { provisioner "remote-exec" { inline = [ - "while [ ! -f /home/opc/admin.finish ] || [ ! -f /home/opc/ip.finish ]; do sleep 10; done", + "while [ ! -f /home/opc/admin.finish ]; do sleep 10; done", ] }