All new accounts created on Gitlab now require administrator approval. If you invite any collaborators, please let Flux staff know so they can approve the accounts.

Commit f4175562 authored by Jonathon Duerig's avatar Jonathon Duerig

Add a 'localContext' for Emulabs that host their own portals outside the Mothership.

parent 8cc582f4
......@@ -6,12 +6,12 @@ $(function () {
var templates = APT_OPTIONS.fetchTemplateList(['edit-modal', 'edit-inline']);
var editModalString = templates['edit-modal'];
var editInlineString = templates['edit-inline'];
var context = {
var aptContext = {
canvasOptions: {
"defaults": [
{
"name": "Add VM",
"image": "urn:publicid:IDN+utahddc.geniracks.net+image+emulab-ops:UBUNTU12-64-STD",
"image": "urn:publicid:IDN+utahddc.geniracks.net+image+emulab-ops:UBUNTU14-64-STD",
"type": "emulab-xen"
}
],
......@@ -23,8 +23,8 @@ $(function () {
},
*/
{
"id": "urn:publicid:IDN+utahddc.geniracks.net+image+emulab-ops:UBUNTU12-64-STD",
"name": "Ubuntu 12.04 LTS 64-bit"
"id": "urn:publicid:IDN+utahddc.geniracks.net+image+emulab-ops:UBUNTU14-64-STD",
"name": "Ubuntu 14.04 LTS 64-bit"
}/*,
{
"id": "urn:publicid:IDN+utahddc.geniracks.net+image+emulab-ops:UBUNTU14-64-STD",
......@@ -40,10 +40,44 @@ $(function () {
}
};
var localContext = {
canvasOptions: {
"defaults": [
{
"name": "Xen VM",
"image": "urn:publicid:IDN+utahddc.geniracks.net+image+emulab-ops:UBUNTU14-64-STD",
"type": "emulab-xen"
},
{
"name": "Bare Metal PC",
"image": "urn:publicid:IDN+utahddc.geniracks.net+image+emulab-ops:UBUNTU14-64-STD",
"type": "raw-pc"
}
],
"images": [
{
"id": "urn:publicid:IDN+utahddc.geniracks.net+image+emulab-ops:UBUNTU14-64-STD",
"name": "Ubuntu 14.04 LTS 64-bit"
}
],
"types": [
{
"id": "emulab-xen",
"name": "Xen VM"
},
{
"id": "raw-pc",
"name": "Bare Metal PC"
}
]
}
};
var waitingInstances = [];
var contextFetched = false;
var contextUrl = "";
var context = aptContext;
if (window.ISCLOUD)
{
contextUrl = 'https://www.emulab.net/protogeni/jacks-context/cloudlab-utah.json';
......@@ -52,6 +86,10 @@ $(function () {
{
contextUrl = 'https://www.emulab.net/protogeni/jacks-context/emulab.json';
}
else if (window.ISEMULAB && ! window.MAINSITE)
{
context = localContext;
}
else if (window.ISPNET)
{
contextUrl = 'https://www.emulab.net/protogeni/jacks-context/phantomnet.json';
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment