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

Merge branch 'develop' into dist/eole/2.7.0/develop

This commit is contained in:
vincent 2019-02-20 14:53:26 +01:00
parent 61ec0243a7 f617e8e54a
commit 34f2778910
2 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dicos/99_one-frontend.xml
View File

@ -32,7 +32,6 @@
<service_access service='sunstone'> <service_access service='sunstone'>
<port port_type="SymLinkOption">port_sunstone</port> <port port_type="SymLinkOption">port_sunstone</port>
<port port_type="SymLinkOption">vnc_proxy_port_sunstone</port> <port port_type="SymLinkOption">vnc_proxy_port_sunstone</port>
<port port_type="SymLinkOption">xmlrpc_port_sunstone</port>
</service_access> </service_access>
<service_restriction service='sunstone'> <service_restriction service='sunstone'>
<ip interface='eth0' netmask='netmask_ssh_eth0' netmask_type='SymLinkOption' ip_type='SymLinkOption'>ip_ssh_eth0</ip> <ip interface='eth0' netmask='netmask_ssh_eth0' netmask_type='SymLinkOption' ip_type='SymLinkOption'>ip_ssh_eth0</ip>
@ -65,17 +64,9 @@
<variable name='sunstone_logo' type='string' description="Logo pour l'interface Sunstone" mode='expert'> <variable name='sunstone_logo' type='string' description="Logo pour l'interface Sunstone" mode='expert'>
<value>opennebula-sunstone-v4.0.png</value> <value>opennebula-sunstone-v4.0.png</value>
</variable> </variable>
<variable name='activer_xmlrpc_port_sunstone' type='oui/non' description="Activer l'accès distant à l'API XML-RPC" mode='expert' exists='False'>
<value>non</value>
</variable>
<!-- le port est là pour bastion, mais on ne peut pas le changer -->
<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' exists='False'>
<value>2633</value>
</variable>
</family> </family>
<separators> <separators>
<separator name='sunstone_view_mode'>Configuration du l'application web OpenNebula Sunstone</separator> <separator name='sunstone_view_mode'>Configuration du l'application web OpenNebula Sunstone</separator>
<!--separator name='activer_xmlrpc_port_sunstone'>Configuration du service XML-RPC</separator-->
</separators> </separators>
</variables> </variables>
@ -98,17 +89,11 @@
<param name='mismatch'>non</param> <param name='mismatch'>non</param>
</auto> </auto>
<condition name='disabled_if_in' source='activer_xmlrpc_port_sunstone'>
<param>non</param>
<target type='variable'>xmlrpc_port_sunstone</target>
</condition>
<condition name='disabled_if_in' source='activer_onefrontend'> <condition name='disabled_if_in' source='activer_onefrontend'>
<param>non</param> <param>non</param>
<target type='filelist'>onefrontend</target> <target type='filelist'>onefrontend</target>
<target type='variable'>port_sunstone</target> <target type='variable'>port_sunstone</target>
<target type='variable'>vnc_proxy_port_sunstone</target> <target type='variable'>vnc_proxy_port_sunstone</target>
<target type='variable'>xmlrpc_port_sunstone</target>
<target type='variable'>ip_sunstone</target> <target type='variable'>ip_sunstone</target>
<target type='variable'>langue_sunstone</target> <target type='variable'>langue_sunstone</target>
<target type='variable'>sunstone_logo</target> <target type='variable'>sunstone_logo</target>

4
tmpl/sunstone-server.conf
View File

@ -24,7 +24,11 @@
# OpenNebula sever contact information # OpenNebula sever contact information
# #
%if %%one_ha_role == 'oui'
:one_xmlrpc: http://%%adresse_ip_eth0:2633/RPC2
%else
:one_xmlrpc: http://localhost:2633/RPC2 :one_xmlrpc: http://localhost:2633/RPC2
%end if
:one_xmlrpc_timeout: 60 :one_xmlrpc_timeout: 60
# Server Configuration # Server Configuration