diff --git a/openstack-login/nodeimage.pkr.hcl b/openstack-login/nodeimage.pkr.hcl index 057cc3ec282a945308eb43d2f430a926b64522af..dad64e131e2bdac4337a212f68329105d16a4cee 100644 --- a/openstack-login/nodeimage.pkr.hcl +++ b/openstack-login/nodeimage.pkr.hcl @@ -35,6 +35,10 @@ source "openstack" "image" { build { sources = ["source.openstack.image"] +<<<<<<< HEAD:openstack-login/nodeimage.pkr.hcl +======= + +>>>>>>> 327768b... Avoid building base instead use base img as src img:openstack-compute/nodeimage.pkr.hcl provisioner "ansible" { use_proxy = false user = var.ssh_username