From 2e1a5c0880b344dea79411e70031a2523ad6fd44 Mon Sep 17 00:00:00 2001
From: Krish Moodbidri <krish94@uab.edu>
Date: Fri, 13 Dec 2024 11:50:23 -0600
Subject: [PATCH] removed merge conflict in nodeimage.pkr.hcl
---
openstack-login/nodeimage.pkr.hcl | 13 -------------
1 file changed, 13 deletions(-)
diff --git a/openstack-login/nodeimage.pkr.hcl b/openstack-login/nodeimage.pkr.hcl
index 81dfa7e..057cc3e 100644
--- a/openstack-login/nodeimage.pkr.hcl
+++ b/openstack-login/nodeimage.pkr.hcl
@@ -35,19 +35,6 @@ source "openstack" "image" {
build {
sources = ["source.openstack.image"]
-<<<<<<< HEAD:openstack-login/nodeimage.pkr.hcl
-=======
-
-<<<<<<< HEAD:openstack-login/nodeimage.pkr.hcl
-<<<<<<< HEAD:openstack-login/nodeimage.pkr.hcl
-<<<<<<< HEAD:openstack-login/nodeimage.pkr.hcl
->>>>>>> 327768b... Avoid building base instead use base img as src img:openstack-compute/nodeimage.pkr.hcl
-=======
->>>>>>> 327768b... Avoid building base instead use base img as src img:openstack-compute/nodeimage.pkr.hcl
-=======
->>>>>>> 327768b... Avoid building base instead use base img as src img:openstack-compute/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
--
GitLab