Browse Source

en HA RPC doit être accessible sur eth0

Emmanuel Garette 3 months ago
parent
commit
f617e8e54a
2 changed files with 4 additions and 15 deletions
  1. 0
    15
      dicos/99_one-frontend.xml
  2. 4
    0
      tmpl/sunstone-server.conf

+ 0
- 15
dicos/99_one-frontend.xml View File

@@ -32,7 +32,6 @@
32 32
         <service_access service='sunstone'>
33 33
             <port port_type="SymLinkOption">port_sunstone</port>
34 34
             <port port_type="SymLinkOption">vnc_proxy_port_sunstone</port>
35
-            <port port_type="SymLinkOption">xmlrpc_port_sunstone</port>
36 35
         </service_access>
37 36
         <service_restriction service='sunstone'>
38 37
             <ip interface='eth0' netmask='netmask_ssh_eth0' netmask_type='SymLinkOption' ip_type='SymLinkOption'>ip_ssh_eth0</ip>
@@ -65,17 +64,9 @@
65 64
             <variable name='sunstone_logo' type='string' description="Logo pour l'interface Sunstone" mode='expert'>
66 65
                 <value>opennebula-sunstone-v4.0.png</value>
67 66
             </variable>
68
-            <variable name='activer_xmlrpc_port_sunstone' type='oui/non' description="Activer l'accès distant à l'API XML-RPC" mode='expert' exists='False'>
69
-                 <value>non</value>
70
-            </variable>
71
-            <!-- le port est là pour bastion, mais on ne peut pas le changer -->
72
-            <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'>
73
-                 <value>2633</value>
74
-            </variable>
75 67
         </family>
76 68
             <separators>
77 69
                 <separator name='sunstone_view_mode'>Configuration du l'application web OpenNebula Sunstone</separator>
78
-                <!--separator name='activer_xmlrpc_port_sunstone'>Configuration du service XML-RPC</separator-->
79 70
             </separators>
80 71
     </variables>
81 72
 
@@ -98,17 +89,11 @@
98 89
           <param name='mismatch'>non</param>
99 90
         </auto>
100 91
 
101
-        <condition name='disabled_if_in' source='activer_xmlrpc_port_sunstone'>
102
-            <param>non</param>
103
-            <target type='variable'>xmlrpc_port_sunstone</target>
104
-        </condition>
105
-
106 92
         <condition name='disabled_if_in' source='activer_onefrontend'>
107 93
             <param>non</param>
108 94
             <target type='filelist'>onefrontend</target>
109 95
             <target type='variable'>port_sunstone</target>
110 96
             <target type='variable'>vnc_proxy_port_sunstone</target>
111
-            <target type='variable'>xmlrpc_port_sunstone</target>
112 97
             <target type='variable'>ip_sunstone</target>
113 98
             <target type='variable'>langue_sunstone</target>
114 99
             <target type='variable'>sunstone_logo</target>

+ 4
- 0
tmpl/sunstone-server.conf View File

@@ -24,7 +24,11 @@
24 24
 
25 25
 # OpenNebula sever contact information
26 26
 #
27
+%if %%one_ha_role == 'oui'
28
+:one_xmlrpc: http://%%adresse_ip_eth0:2633/RPC2
29
+%else
27 30
 :one_xmlrpc: http://localhost:2633/RPC2
31
+%end if
28 32
 :one_xmlrpc_timeout: 60
29 33
 
30 34
 # Server Configuration