From 9244ce0198fcc071563c2d35975d12351366a77d Mon Sep 17 00:00:00 2001
From: Philippe Caseiro <pcaseiro@cadoles.com>
Date: Wed, 12 Nov 2014 14:58:50 +0100
Subject: [PATCH] dicos/99_one-frontend.xml: Ajout des variables pour la market
 place
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

On donne la possibilité de saisir l'adresse d'un market centrel (ex académie ou EOLE).

ref #9543 @30m
---
 dicos/99_one-frontend.xml | 10 ++++++++++
 tmpl/sunstone-server.conf |  4 ++++
 2 files changed, 14 insertions(+)

diff --git a/dicos/99_one-frontend.xml b/dicos/99_one-frontend.xml
index 645f836..baeadb8 100644
--- a/dicos/99_one-frontend.xml
+++ b/dicos/99_one-frontend.xml
@@ -37,6 +37,10 @@
                 <value>fr_FR</value>
             </variable>
             <variable name='sunstone_auth_modes' type='string' description="Modes supplémentaires d'authentification des utilisateurs" mode='expert'/>
+            <variable name='activer_market_place' type='oui/non' description="Activer l'utilisation d'une place de marché distante" mode='expert'>
+              <value>non</value>
+            </variable>
+            <variable name='market_place_url' type='web_address' description="Adresse de la place de marché distante" mode='expert'/>
             <variable name='activer_market_views' type='oui/non' description="Activer l'intégration appmarket dans Sunstone" mode="expert">
                 <value>non</value>
             </variable>
@@ -69,6 +73,7 @@
             <target type='variable'>ip_sunstone</target>
             <target type='variable'>langue_sunstone</target>
         </condition>
+
         <condition name='disabled_if_in' source='activer_market_views'>
           <param>non</param>
           <target type='variable'>appmarket_endpoint</target>
@@ -76,6 +81,11 @@
           <target type='variable'>appmarket_password</target>
           <target type='filelist'>appmarket</target>
         </condition>
+
+        <condition name='disabled_if_in' source='activer_market_place'>
+          <param>non</param>
+          <target type='variable'>market_place_url</target>
+        </condition>
     </constraints>
     <help>
         <variable name='activer_onefrontend'>Interface d'administration du Cluster OpenNebula.</variable>
diff --git a/tmpl/sunstone-server.conf b/tmpl/sunstone-server.conf
index 9095744..1f30c32 100644
--- a/tmpl/sunstone-server.conf
+++ b/tmpl/sunstone-server.conf
@@ -118,7 +118,11 @@
 
 # Marketplace endpoint
 #
+%if getVar('activer_market_place','non') == 'oui'
+:Marketplace_url: %%market_place_url
+%else 
 :marketplace_url: http://marketplace.c12g.com/appliance
+%end if
 
 %if %%getVar('activer_oneflow', 'non') == 'oui'
 ################################################################################