Browse Source

Remove obsolete Appmarket configuration

Ref: #24204
Daniel Dehennin 11 months ago
parent
commit
cbd4cbbda6
3 changed files with 1 additions and 68 deletions
  1. 1
    31
      dicos/99_one-frontend.xml
  2. 0
    29
      tmpl/sunstone-appmarket.conf
  3. 0
    8
      tmpl/sunstone-server.conf

+ 1
- 31
dicos/99_one-frontend.xml View File

@@ -22,7 +22,7 @@
22 22
 
23 23
 
24 24
         <file filelist='onefrontend' name='/etc/nginx/sites-available/nebula.conf' source='nginx-nebula.conf'/>
25
-        <file filelist='appmarket' name='/etc/one/sunstone-appmarket.conf' rm='True'/>
25
+
26 26
         <service_access service='sunstoneHttps'>
27 27
             <port>443</port>
28 28
         </service_access>
@@ -46,10 +46,6 @@
46 46
             <variable name='activer_onefrontend' type='oui/non' description="Activer l'application web OpenNebula Sunstone" mode="expert">
47 47
                 <value>oui</value>
48 48
             </variable>
49
-            <!-- FIXME : variable sans effet depuis la gestion des marketplaces comme ressources #17333 -->
50
-            <variable name='activer_market_place' type='oui/non' description="Activer l'utilisation d'une place de marché distante" mode='expert' hidden='True'>
51
-                <value>non</value>
52
-            </variable>
53 49
         </family>
54 50
         <family name='Virtualisation'>
55 51
             <variable name='sunstone_view_mode' type='string' description='Mode d’affichage par défaut des vues' mode='expert'>
@@ -76,21 +72,10 @@
76 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'>
77 73
                  <value>2633</value>
78 74
             </variable>
79
-            <variable name='market_place_url' type='web_address' description="Adresse de la place de marché distante" mode='expert' mandatory="True">
80
-                <value>http://marketplace.c12g.com/appliance</value>
81
-            </variable>
82
-            <!-- FIXME : variable sans effet depuis la gestion des marketplaces comme ressources #17333 -->
83
-            <variable name='activer_market_views' type='oui/non' description="Activer l'intégration AppMarket dans l'application web OpenNebula Sunstone" mode="expert" hidden='True'>
84
-                <value>non</value>
85
-            </variable>
86
-            <variable name='appmarket_endpoint' type='web_address' description="Adresse du serveur AppMarket" mode='expert' mandatory="True"/>
87
-            <variable name='appmarket_user' type='string' description="Utilisateur d'administration du serveur AppMarket" mode='expert' mandatory="True"/>
88
-            <variable name='appmarket_password' type='string' description="Mot de passe de l'administrateur du serveur AppMarket" mode='expert' mandatory="True"/>
89 75
         </family>
90 76
             <separators>
91 77
                 <separator name='sunstone_auth_modes'>Configuration du l'application web OpenNebula Sunstone</separator>
92 78
                 <separator name='activer_xmlrpc_port_sunstone'>Configuration du service XML-RPC</separator>
93
-                <separator name='market_place_url'>Configuration de la place de marché distante</separator>
94 79
             </separators>
95 80
     </variables>
96 81
 
@@ -129,18 +114,6 @@
129 114
             <target type='variable'>sunstone_logo</target>
130 115
         </condition>
131 116
 
132
-        <condition name='disabled_if_in' source='activer_market_views'>
133
-          <param>non</param>
134
-          <target type='variable'>appmarket_endpoint</target>
135
-          <target type='variable'>appmarket_user</target>
136
-          <target type='variable'>appmarket_password</target>
137
-          <target type='filelist'>appmarket</target>
138
-        </condition>
139
-
140
-        <condition name='disabled_if_in' source='activer_market_place'>
141
-          <param>non</param>
142
-          <target type='variable'>market_place_url</target>
143
-        </condition>
144 117
     </constraints>
145 118
     <help>
146 119
         <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 @@
148 121
         <variable name='vnc_proxy_port_sunstone'>Numéro de port d'écoute du proxy VNC (novnc)</variable>
149 122
         <variable name='ip_sunstone'>Adresse IP d'écoute pour OpenNebula Sunstone</variable>
150 123
         <variable name='langue_sunstone'>Langue par défaut de l'interface OpenNebula Sunstone</variable>
151
-        <variable name='appmarket_endpoint'>Adresse du serveur appmarket (URL http://serveur.domaine.fr[:port] ou https://xxx.xxx.xxx.xxx[:port])</variable>
152
-        <variable name='appmarket_user'>Utilisateur d'administration du serveur appmarket (déclaré dans la configuration du serveur appmarket)</variable>
153
-        <variable name='appmarket_password'>Mot de passe de l'administrateur du serveur appmarket</variable>
154 124
     </help>
155 125
 </creole>

+ 0
- 29
tmpl/sunstone-appmarket.conf View File

@@ -1,29 +0,0 @@
1
-# -------------------------------------------------------------------------- #
2
-# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs        #
3
-#                                                                            #
4
-# Licensed under the Apache License, Version 2.0 (the "License"); you may    #
5
-# not use this file except in compliance with the License. You may obtain    #
6
-# a copy of the License at                                                   #
7
-#                                                                            #
8
-# http://www.apache.org/licenses/LICENSE-2.0                                 #
9
-#                                                                            #
10
-# Unless required by applicable law or agreed to in writing, software        #
11
-# distributed under the License is distributed on an "AS IS" BASIS,          #
12
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
13
-# See the License for the specific language governing permissions and        #
14
-# limitations under the License.                                             #
15
-#--------------------------------------------------------------------------- #
16
-
17
-################################################################################
18
-# AppMarket
19
-################################################################################
20
-
21
-# AppMarket username and password
22
-# If no credentials are provided, an anonymous client will be used
23
-#
24
-:appmarket_username: %%appmarket_user
25
-:appmarket_password: %%appmarket_password
26
-
27
-# AppMarket endpoint
28
-#
29
-:appmarket_url: %%appmarket_endpoint

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

@@ -148,12 +148,7 @@
148 148
 # The url should not include the /appliance path since it will be automatically
149 149
 # included
150 150
 #
151
-%if %%getVar('activer_market_place','non') == 'oui'
152
-:marketplace_url: %%market_place_url
153
-%else
154 151
 :marketplace_url: http://marketplace.opennebula.systems/
155
-%end if
156
-
157 152
 
158 153
 %if %%getVar('activer_oneflow', 'non') == 'oui'
159 154
 ################################################################################
@@ -188,8 +183,5 @@
188 183
 
189 184
 :routes:
190 185
     - oneflow
191
-%if %%getVar('activer_market_views', 'non') == 'oui'
192
-    - appmarket
193
-%end if
194 186
     - vcenter
195 187
     - support