Cadoles/eole-one-frontend
20
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update sunstone daemon configuration file template

Browse Source 
* 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
This commit is contained in:
Daniel Dehennin 2018-06-13 15:19:26 +02:00
parent ff6baefcc9
commit 3a42e0a426
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dicos/99_one-frontend.xml
View File

@ -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>

6
tmpl/sunstone-server.conf
View File

@ -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
################################################################################