Merge branch 'nested-release' into nested/2020.1 Bringin in changes.

aristanetworks · Oct 29, 2020 · 31c4f22 · 31c4f22
2 parents d1eb5aa + e6a8709
commit 31c4f22
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 13 deletions.
diff --git a/nested-labvm/services/atdUpdate/atdUpdate.sh b/nested-labvm/services/atdUpdate/atdUpdate.sh
@@ -34,9 +34,13 @@ sed -i "s/{ARISTA_REPLACE}/$APWD/g" /opt/atd/topologies/$TOPO/files/infra/user-m
 # Update atdUpdate service
 
 cp /opt/atd/nested-labvm/services/atdUpdate/atdUpdate.sh /usr/local/bin/
-cp /opt/atd/nested-labvm/services/atdUpdate/atdUpdate.service /etc/systemd/system/
 
-systemctl daemon-reload
+# Removing systemd file copy over for future
+# To be deprecated.
+
+# cp /opt/atd/nested-labvm/services/atdUpdate/atdUpdate.service /etc/systemd/system/
+
+# systemctl daemon-reload
 
 # Update the base configlets for ceos/veos mgmt numbering
 

diff --git a/topologies/base_topo.yml b/topologies/base_topo.yml
@@ -7,14 +7,14 @@ topologies:
         ram: 36
         cvp:
           2020.1:
-            branch: nested/2020.1
-            image: base-atd-datacenter-ceos-c2020-1-1-20200917
+            branch: nginx-ssl
+            image: base-atd-datacenter-ceos-c2020-1-1-20201027-u
             eos:
               - 4.24.1.1F
               - 4.24.2.1F
           2020.2:
-            branch: nested-release
-            image: base-atd-datacenter-ceos-c2020-2-1-20200917
+            branch: nginx-ssl
+            image: base-atd-datacenter-ceos-c2020-2-1-20201027-u
             eos:
               - 4.24.1.1F
               - 4.24.2.1F
@@ -24,12 +24,12 @@ topologies:
         cvp:
           2020.1:
             branch: nested/2020.1
-            image: base-atd-datacenter-e4-24-1f-c2020-1-1-20200909-u
+            image: base-atd-datacenter-e4-24-1f-c2020-1-1-20201029-u
             eos:
               - 4.24.1F
           2020.2:
             branch: nested-release
-            image: base-atd-datacenter-e4-24-2-1f-c2020-2-1-20200911
+            image: base-atd-datacenter-e4-24-2-1f-c2020-2-1-20201029-u
             eos:
               - 4.24.2.1F
     prod:
@@ -38,7 +38,7 @@ topologies:
         ram: 60
         cvp:
           2020.1:
-            branch: v1.0.20200910a
+            branch: v2020.1.20201016a
             image: base-atd-datacenter-e4-24-1f-c2020-1-1-20200909-u
             eos:
               - 4.24.1F
@@ -53,7 +53,7 @@ topologies:
         cvp:
           2020.1:
             branch: nested/2020.1
-            image: base-atd-routing-e4-24-1f-c2020-1-1-20200701-u
+            image: base-atd-routing-e4-24-1f-c2020-1-1-20201029-u
             eos:
               - 4.24.1F
           2020.2:
@@ -77,7 +77,7 @@ topologies:
         ram: 90
         cvp:
           2020.1:
-            branch: v1.0.20200910a
+            branch: v2020.1.20201016a
             image: base-atd-routing-e4-24-1f-c2020-1-1-20200701-u
             eos:
               - 4.24.1F
@@ -92,7 +92,7 @@ topologies:
         cvp:
           2020.1:
             branch: nested/2020.1
-            image: base-training-e4-24-1f-c2020-1-1-20200916-u
+            image: base-training-e4-24-1f-c2020-1-1-20201029-u
             eos:
               - 4.24.1F
     prod:
@@ -101,7 +101,7 @@ topologies:
         ram: 72
         cvp:
           2020.1:
-            branch: v1.0.20200910a
+            branch: v2020.1.20201016a
             image: base-training-e4-24-1f-c2020-1-1-20200916-u
             eos:
               - 4.24.1F

diff --git a/topologies/routing/topo_build.yml b/topologies/routing/topo_build.yml
@@ -301,3 +301,4 @@ nodes:
           neighborPort: Ethernet6
           port: Ethernet1
 
+additional_ssh_nodes:
Original file line number	Diff line number	Diff line change
Expand Up		@@ -301,3 +301,4 @@ nodes:
		neighborPort: Ethernet6
		port: Ethernet1

		additional_ssh_nodes: