Daniel Dehennin
Ursprung
ec5a11c6c9
Commit
cbd4cbbda6
|
|
@ -22,7 +22,7 @@
|
|||
|
||||
|
||||
<file filelist='onefrontend' name='/etc/nginx/sites-available/nebula.conf' source='nginx-nebula.conf'/>
|
||||
<file filelist='appmarket' name='/etc/one/sunstone-appmarket.conf' rm='True'/>
|
||||
|
||||
<service_access service='sunstoneHttps'>
|
||||
<port>443</port>
|
||||
</service_access>
|
||||
|
|
@ -46,10 +46,6 @@
|
|||
<variable name='activer_onefrontend' type='oui/non' description="Activer l'application web OpenNebula Sunstone" mode="expert">
|
||||
<value>oui</value>
|
||||
</variable>
|
||||
<!-- FIXME : variable sans effet depuis la gestion des marketplaces comme ressources #17333 -->
|
||||
<variable name='activer_market_place' type='oui/non' description="Activer l'utilisation d'une place de marché distante" mode='expert' hidden='True'>
|
||||
<value>non</value>
|
||||
</variable>
|
||||
</family>
|
||||
<family name='Virtualisation'>
|
||||
<variable name='sunstone_view_mode' type='string' description='Mode d’affichage par défaut des vues' mode='expert'>
|
||||
|
|
@ -76,21 +72,10 @@
|
|||
<variable name='xmlrpc_port_sunstone' type='number' description="Numéro de port d'écoute de l'API XML-RPC" mode='expert' mandatory="True" hidden='True'>
|
||||
<value>2633</value>
|
||||
</variable>
|
||||
<variable name='market_place_url' type='web_address' description="Adresse de la place de marché distante" mode='expert' mandatory="True">
|
||||
<value>http://marketplace.c12g.com/appliance</value>
|
||||
</variable>
|
||||
<!-- FIXME : variable sans effet depuis la gestion des marketplaces comme ressources #17333 -->
|
||||
<variable name='activer_market_views' type='oui/non' description="Activer l'intégration AppMarket dans l'application web OpenNebula Sunstone" mode="expert" hidden='True'>
|
||||
<value>non</value>
|
||||
</variable>
|
||||
<variable name='appmarket_endpoint' type='web_address' description="Adresse du serveur AppMarket" mode='expert' mandatory="True"/>
|
||||
<variable name='appmarket_user' type='string' description="Utilisateur d'administration du serveur AppMarket" mode='expert' mandatory="True"/>
|
||||
<variable name='appmarket_password' type='string' description="Mot de passe de l'administrateur du serveur AppMarket" mode='expert' mandatory="True"/>
|
||||
</family>
|
||||
<separators>
|
||||
<separator name='sunstone_auth_modes'>Configuration du l'application web OpenNebula Sunstone</separator>
|
||||
<separator name='activer_xmlrpc_port_sunstone'>Configuration du service XML-RPC</separator>
|
||||
<separator name='market_place_url'>Configuration de la place de marché distante</separator>
|
||||
</separators>
|
||||
</variables>
|
||||
|
||||
|
|
@ -129,18 +114,6 @@
|
|||
<target type='variable'>sunstone_logo</target>
|
||||
</condition>
|
||||
|
||||
<condition name='disabled_if_in' source='activer_market_views'>
|
||||
<param>non</param>
|
||||
<target type='variable'>appmarket_endpoint</target>
|
||||
<target type='variable'>appmarket_user</target>
|
||||
<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='sunstone_view_mode'>Utiliser l’un des types de vues par défaut en fonction de l’hyperviseur</variable>
|
||||
|
|
@ -148,8 +121,5 @@
|
|||
<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>
|
||||
<variable name='langue_sunstone'>Langue par défaut de l'interface OpenNebula Sunstone</variable>
|
||||
<variable name='appmarket_endpoint'>Adresse du serveur appmarket (URL http://serveur.domaine.fr[:port] ou https://xxx.xxx.xxx.xxx[:port])</variable>
|
||||
<variable name='appmarket_user'>Utilisateur d'administration du serveur appmarket (déclaré dans la configuration du serveur appmarket)</variable>
|
||||
<variable name='appmarket_password'>Mot de passe de l'administrateur du serveur appmarket</variable>
|
||||
</help>
|
||||
</creole>
|
||||
|
|
|
|||
|
|
@ -1,29 +0,0 @@
|
|||
# -------------------------------------------------------------------------- #
|
||||
# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs #
|
||||
# #
|
||||
# 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 #
|
||||
# a copy of the License at #
|
||||
# #
|
||||
# http://www.apache.org/licenses/LICENSE-2.0 #
|
||||
# #
|
||||
# Unless required by applicable law or agreed to in writing, software #
|
||||
# distributed under the License is distributed on an "AS IS" BASIS, #
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
|
||||
# See the License for the specific language governing permissions and #
|
||||
# limitations under the License. #
|
||||
#--------------------------------------------------------------------------- #
|
||||
|
||||
################################################################################
|
||||
# AppMarket
|
||||
################################################################################
|
||||
|
||||
# AppMarket username and password
|
||||
# If no credentials are provided, an anonymous client will be used
|
||||
#
|
||||
:appmarket_username: %%appmarket_user
|
||||
:appmarket_password: %%appmarket_password
|
||||
|
||||
# AppMarket endpoint
|
||||
#
|
||||
:appmarket_url: %%appmarket_endpoint
|
||||
|
|
@ -148,12 +148,7 @@
|
|||
# The url should not include the /appliance path since it will be automatically
|
||||
# included
|
||||
#
|
||||
%if %%getVar('activer_market_place','non') == 'oui'
|
||||
:marketplace_url: %%market_place_url
|
||||
%else
|
||||
:marketplace_url: http://marketplace.opennebula.systems/
|
||||
%end if
|
||||
|
||||
|
||||
%if %%getVar('activer_oneflow', 'non') == 'oui'
|
||||
################################################################################
|
||||
|
|
@ -188,8 +183,5 @@
|
|||
|
||||
:routes:
|
||||
- oneflow
|
||||
%if %%getVar('activer_market_views', 'non') == 'oui'
|
||||
- appmarket
|
||||
%end if
|
||||
- vcenter
|
||||
- support
|
||||
|
|
|
|||
Laden…
In neuem Issue referenzieren