Merge pull request #579 from hussamnasir/add-usignite-racks-1

Additions for new US Ignite racks
GENI-NSF · Jul 17, 2017 · 7dda8b0 · 7dda8b0
2 parents 5b9efdc + eac2de7
commit 7dda8b0
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 0 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -4,6 +4,12 @@
 
 ## Changes
 
+* Add UVM US Ignite rack
+  ([#574](https://github.com/GENI-NSF/geni-ch/issues/574))
+* Add UT Dallas US Ignite rack
+  ([#575](https://github.com/GENI-NSF/geni-ch/issues/575))
+* Add University of Louisiana Lafayette US Ignite rack
+  ([#576](https://github.com/GENI-NSF/geni-ch/issues/576))
 * Fix import error in geni-sign-tool-csr
   ([#577](https://github.com/GENI-NSF/geni-ch/issues/577))
 

diff --git a/data/Makefile.am b/data/Makefile.am
@@ -75,6 +75,7 @@ AM_SQL = \
 	sr/sql/add-uky-pg.sql \
 	sr/sql/add-ukypks2-ig.sql \
 	sr/sql/add-ukypks2-vts.sql \
+	sr/sql/add-ullafayette-ig.sql \
 	sr/sql/add-umich-ig.sql \
 	sr/sql/add-umkc-ig.sql \
 	sr/sql/add-utah-clab.sql \
@@ -83,6 +84,8 @@ AM_SQL = \
 	sr/sql/add-utah-stitch.sql \
 	sr/sql/add-utahddc-ig.sql \
 	sr/sql/add-utc-ig.sql \
+	sr/sql/add-utdallas-ig.sql \
+	sr/sql/add-uvm-ig.sql \
 	sr/sql/add-uwashington-ig.sql \
 	sr/sql/add-vt-ig.sql \
 	sr/sql/add-wall2.sql \

diff --git a/data/sr/aggdata.csv b/data/sr/aggdata.csv
@@ -77,3 +77,6 @@ ukypks2-vts,https://ukypks2.vts.bsswks.net:3626/foam/gapi/2,,UKYPKS2 VTS,UKYPKS2
 nps-vts,https://nps.vts.bsswks.net:3626/foam/gapi/2,,NPS VTS,NPS VTS,urn:publicid:IDN+nps.vts.bsswks.net+authority+cm,,ui_vts_am,ui_network_cat ui_experimental_cat,N
 illinois-vts,https://uiuc.vts.bsswks.net:3626/foam/gapi/2,,Illinois VTS,Illinois VTS,urn:publicid:IDN+uiuc.vts.bsswks.net+authority+cm,,ui_vts_am,ui_network_cat ui_experimental_cat,N
 hawaii-ig,https://instageni.hawaii.edu:12369/protogeni/xmlrpc/am,,University of Hawaii InstaGENI,University of Hawaii InstaGENI Rack,urn:publicid:IDN+instageni.hawaii.edu+authority+cm,,ui_instageni_am,ui_prod_cat ui_compute_cat,Y
+uvm-ig,https://instageni.uvm.edu:12369/protogeni/xmlrpc/am,,University of Vermont InstaGENI,University of Vermont InstaGENI Rack,urn:publicid:IDN+instageni.uvm.edu+authority+cm,,ui_instageni_am,ui_prod_cat ui_compute_cat ui_stitchable_cat ui_federated_cat,Y
+ullafayette-ig,https://instageni.louisiana.edu:12369/protogeni/xmlrpc/am,,University of Louisiana InstaGENI,University of Louisiana at Lafayette InstaGENI Rack,urn:publicid:IDN+instageni.louisiana.edu+authority+cm,,ui_instageni_am,ui_prod_cat ui_compute_cat ui_stitchable_cat ui_federated_cat,Y
+utdallas-ig,https://instageni.utdallas.edu:12369/protogeni/xmlrpc/am,,University of Texas InstaGENI,University of Texas at Dallas at InstaGENI Rack,urn:publicid:IDN+instageni.utdallas.edu+authority+cm,,ui_instageni_am,ui_prod_cat ui_compute_cat ui_stitchable_cat ui_federated_cat,Y
diff --git a/geni-chapi.spec b/geni-chapi.spec
@@ -536,6 +536,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}/sr/sql/add-ukymcv-ig.sql
 %{_datadir}/%{name}/sr/sql/add-ukypks2-ig.sql
 %{_datadir}/%{name}/sr/sql/add-ukypks2-vts.sql
+%{_datadir}/%{name}/sr/sql/add-ullafayette-ig.sql
 %{_datadir}/%{name}/sr/sql/add-umich-ig.sql
 %{_datadir}/%{name}/sr/sql/add-umkc-ig.sql
 %{_datadir}/%{name}/sr/sql/add-utah-clab.sql
@@ -544,6 +545,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}/sr/sql/add-utah-stitch.sql
 %{_datadir}/%{name}/sr/sql/add-utahddc-ig.sql
 %{_datadir}/%{name}/sr/sql/add-utc-ig.sql
+%{_datadir}/%{name}/sr/sql/add-utdallas-ig.sql
+%{_datadir}/%{name}/sr/sql/add-uvm-ig.sql
 %{_datadir}/%{name}/sr/sql/add-wall2.sql
 %{_datadir}/%{name}/sr/sql/add-uwashington-ig.sql
 %{_datadir}/%{name}/sr/sql/add-vt-ig.sql