From 3a42e0a4267bcea8770ae35606bed52d9901f31c Mon Sep 17 00:00:00 2001
From: Daniel Dehennin <daniel.dehennin@ac-dijon.fr>
Date: Wed, 13 Jun 2018 15:19:26 +0200
Subject: [PATCH] Update sunstone daemon configuration file template
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* dicos/99_one-frontend.xml: new variable to select the default mode
  for views between “kvm”, “mixed” or “vcenter”.

* tmpl/sunstone-server.conf: use the new variable.

Ref: #24201
---
 dicos/99_one-frontend.xml | 8 ++++++++
 tmpl/sunstone-server.conf | 6 +++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/dicos/99_one-frontend.xml b/dicos/99_one-frontend.xml
index dd2fa74..c063de9 100644
--- a/dicos/99_one-frontend.xml
+++ b/dicos/99_one-frontend.xml
@@ -42,6 +42,9 @@
             </variable>
         </family>
         <family name='Virtualisation'>
+            <variable name='sunstone_view_mode' type='string' description='Mode d’affichage par défaut des vues' mode='expert'>
+                <value>kvm</value>
+            </variable>
             <variable name='sunstone_auth_modes' type='string' description="Modes supplémentaires d'authentification des utilisateurs" mode='expert'/>
             <variable name='port_sunstone' type='number' description="Numéro de port d'écoute" mode="expert" hidden='True'>
                 <value>9000</value>
@@ -82,6 +85,10 @@
     </variables>
 
     <constraints>
+        <check name='valid_enum' target='sunstone_view_mode'>
+            <param>['kvm', 'mixed', 'vcenter']</param>
+        </check>
+
         <fill name='calc_val' target='ip_sunstone'>
             <param type='eole' name='valeur'>adresse_ip_eth0</param>
         </fill>
@@ -126,6 +133,7 @@
         </condition>
     </constraints>
     <help>
+        <variable name='sunstone_view_mode'>Utiliser l’un des types de vues par défaut en fonction de l’hyperviseur</variable>
         <variable name='port_sunstone'>Numéro de port d'écoute d'OpenNebula Sunstone</variable>
         <variable name='vnc_proxy_port_sunstone'>Numéro de port d'écoute du proxy VNC (novnc)</variable>
         <variable name='ip_sunstone'>Adresse IP d'écoute pour OpenNebula Sunstone</variable>
diff --git a/tmpl/sunstone-server.conf b/tmpl/sunstone-server.conf
index 0c43ab3..f18c56f 100644
--- a/tmpl/sunstone-server.conf
+++ b/tmpl/sunstone-server.conf
@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2017, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #
@@ -25,6 +25,7 @@
 # OpenNebula sever contact information
 #
 :one_xmlrpc: http://localhost:2633/RPC2
+:one_xmlrpc_timeout: 60
 
 # Server Configuration
 #
@@ -130,6 +131,9 @@
 # Default table order
 :table_order: desc
 
+# Default views directory
+:mode: '%%sunstone_view_mode'
+
 ################################################################################
 # Marketplace
 ################################################################################