From ccf18ed3cc85efff75e4e449d55c00209951f1a9 Mon Sep 17 00:00:00 2001
From: sbyrnes1 <sbyrnes@internet2.edu>
Date: Sun, 17 Mar 2024 22:57:08 +0000
Subject: [PATCH] enabler: Reorganization; update startup config

---
 .gitignore                                                    | 4 +++-
 .../{ => images/internet2_getting_started}/Containerfile      | 1 +
 .../{ => images/internet2_getting_started}/workshop-init.sh   | 0
 internal-lab-setup-assets/startup-config/cisco1.conf          | 1 -
 internal-lab-setup-assets/startup-config/cisco2.conf          | 1 -
 internal-lab-setup-assets/startup-config/cisco3.conf          | 1 -
 6 files changed, 4 insertions(+), 4 deletions(-)
 rename internal-lab-setup-assets/{ => images/internet2_getting_started}/Containerfile (99%)
 rename internal-lab-setup-assets/{ => images/internet2_getting_started}/workshop-init.sh (100%)

diff --git a/.gitignore b/.gitignore
index 5e472ba..dea088c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,6 @@
 .DS_Store
 *.bak
-internal-lab-setup-assets/images/*
+internal-lab-setup-assets/workshop[0-9]*.yml
+internal-lab-setup-assets/clab-automation-workshop-*
+internal-lab-setup-assets/images/xrd
 !internal-lab-setup-assets/images/README.md
diff --git a/internal-lab-setup-assets/Containerfile b/internal-lab-setup-assets/images/internet2_getting_started/Containerfile
similarity index 99%
rename from internal-lab-setup-assets/Containerfile
rename to internal-lab-setup-assets/images/internet2_getting_started/Containerfile
index 48c16c1..a9f0435 100644
--- a/internal-lab-setup-assets/Containerfile
+++ b/internal-lab-setup-assets/images/internet2_getting_started/Containerfile
@@ -10,6 +10,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     net-tools \
     iputils-ping \
     traceroute \
+    git \
     pip \
     make \
     vim nano emacs
diff --git a/internal-lab-setup-assets/workshop-init.sh b/internal-lab-setup-assets/images/internet2_getting_started/workshop-init.sh
similarity index 100%
rename from internal-lab-setup-assets/workshop-init.sh
rename to internal-lab-setup-assets/images/internet2_getting_started/workshop-init.sh
diff --git a/internal-lab-setup-assets/startup-config/cisco1.conf b/internal-lab-setup-assets/startup-config/cisco1.conf
index dd8e453..5e86b32 100644
--- a/internal-lab-setup-assets/startup-config/cisco1.conf
+++ b/internal-lab-setup-assets/startup-config/cisco1.conf
@@ -74,7 +74,6 @@ router bgp 64500
  !
  neighbor-group LAB
   remote-as 64500
-  ebgp-multihop 2
   password encrypted 15140403062B39
   update-source Loopback0
   address-family ipv4 unicast
diff --git a/internal-lab-setup-assets/startup-config/cisco2.conf b/internal-lab-setup-assets/startup-config/cisco2.conf
index d4680c8..9079f8d 100644
--- a/internal-lab-setup-assets/startup-config/cisco2.conf
+++ b/internal-lab-setup-assets/startup-config/cisco2.conf
@@ -70,7 +70,6 @@ router bgp 64500
  !
  neighbor-group LAB
   remote-as 64500
-  ebgp-multihop 2
   password encrypted 15140403062B39
   update-source Loopback0
   address-family ipv4 unicast
diff --git a/internal-lab-setup-assets/startup-config/cisco3.conf b/internal-lab-setup-assets/startup-config/cisco3.conf
index ad00472..4108a0e 100644
--- a/internal-lab-setup-assets/startup-config/cisco3.conf
+++ b/internal-lab-setup-assets/startup-config/cisco3.conf
@@ -60,7 +60,6 @@ router bgp 64500
  !
  neighbor-group LAB
   remote-as 64500
-  ebgp-multihop 2
   password encrypted 15140403062B39
   update-source Loopback0
   address-family ipv4 unicast