Commit 959ddf1e authored by Vangelis Koukis's avatar Vangelis Koukis
Browse files

Fix atom metadata, make GUI use API_URL everywhere

parent 0c61ec81
......@@ -3,12 +3,12 @@
<feed xmlns="http://www.w3.org/2005/Atom">
<title type="text">About This Version</title>
<updated>{{ now }}</updated>
<id>http://ocenan.grnet.com/</id>
<id>http://ocean.grnet.gr/</id>
<author>
<name>Synnefo</name>
<uri>http://ocenan.grnet.com/</uri>
<uri>http://ocean.grnet.gr/</uri>
</author>
<link rel="self" href="http://ocenan.grnet.com/"/>
<link rel="self" href="http://ocean.grnet.gr/"/>
<entry>
<id>http://servers.api.openstack.org/{{ version.id }}/</id>
......
......@@ -3,12 +3,12 @@
<feed xmlns="http://www.w3.org/2005/Atom">
<title type="text">Available API Versions</title>
<updated>{{ now }}</updated>
<id>http://ocenan.grnet.com/</id>
<id>http://ocean.grnet.gr/</id>
<author>
<name>Synnefo</name>
<uri>http://ocenan.grnet.com/</uri>
<uri>http://ocean.grnet.gr/</uri>
</author>
<link rel="self" href="http://ocenan.grnet.com/"/>
<link rel="self" href="http://ocean.grnet.gr/"/>
{% for version in versions %}
<entry>
......
var flavors = [], images = [], servers = [], disks = [], cpus = [], ram = [];
var changes_since = 0, deferred = 0, update_request = false, load_request = false, pending_actions = [];
var API_URL = "/api/v1.1redux";
var API_URL = "/api/v1.1";
function ISODateString(d){
//return a date in an ISO 8601 format using UTC.
......@@ -213,7 +213,7 @@ function confirm_action(action_string, action_function, serverIDs, serverNames)
// get and show a list of running and terminated machines
function update_vms(interval) {
try{ console.info('updating machines'); } catch(err){}
var uri='/api/v1.0/servers/detail';
var uri= API_URL + '/servers/detail';
if (changes_since != 0)
uri+='?changes-since='+changes_since
......@@ -473,7 +473,7 @@ function create_vm(machineName, imageRef, flavorRef){
$.ajax({
url: "/api/v1.0/servers",
url: API_URL + '/servers',
type: "POST",
dataType: "json",
data: JSON.stringify(payload),
......
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