From f617e8e54a4bae708c0293013a93129351f14c0a Mon Sep 17 00:00:00 2001
From: Emmanuel Garette <egarette@cadoles.com>
Date: Wed, 20 Feb 2019 14:16:55 +0100
Subject: [PATCH] =?UTF-8?q?en=20HA=20RPC=20doit=20=C3=AAtre=20accessible?=
 =?UTF-8?q?=20sur=20eth0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dicos/99_one-frontend.xml | 15 ---------------
 tmpl/sunstone-server.conf |  4 ++++
 2 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/dicos/99_one-frontend.xml b/dicos/99_one-frontend.xml
index 58b4da7..9a6efe7 100644
--- a/dicos/99_one-frontend.xml
+++ b/dicos/99_one-frontend.xml
@@ -32,7 +32,6 @@
         <service_access service='sunstone'>
             <port port_type="SymLinkOption">port_sunstone</port>
             <port port_type="SymLinkOption">vnc_proxy_port_sunstone</port>
-            <port port_type="SymLinkOption">xmlrpc_port_sunstone</port>
         </service_access>
         <service_restriction service='sunstone'>
             <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'>
                 <value>opennebula-sunstone-v4.0.png</value>
             </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>
             <separators>
                 <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>
     </variables>
 
@@ -98,17 +89,11 @@
           <param name='mismatch'>non</param>
         </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'>
             <param>non</param>
             <target type='filelist'>onefrontend</target>
             <target type='variable'>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'>langue_sunstone</target>
             <target type='variable'>sunstone_logo</target>
diff --git a/tmpl/sunstone-server.conf b/tmpl/sunstone-server.conf
index fc7da0f..74f0f4d 100644
--- a/tmpl/sunstone-server.conf
+++ b/tmpl/sunstone-server.conf
@@ -24,7 +24,11 @@
 
 # OpenNebula sever contact information
 #
+%if %%one_ha_role == 'oui'
+:one_xmlrpc: http://%%adresse_ip_eth0:2633/RPC2
+%else
 :one_xmlrpc: http://localhost:2633/RPC2
+%end if
 :one_xmlrpc_timeout: 60
 
 # Server Configuration