From e00d9046638daef199f583e20ddc8eab57ab5e9b Mon Sep 17 00:00:00 2001
From: Daniel Dehennin <daniel.dehennin@ac-dijon.fr>
Date: Mon, 14 Nov 2016 13:32:19 +0100
Subject: [PATCH 1/3] Autoriser tous les utilisateurs LDAP

Dans un premier temps.

* tmpl/sunstone-ldap_auth.conf: Activer :mapping_default.

Cherry-picked for 2.6.0 from 71e3fedc6a6851353378f0e1e04f7b3936511667

Ref: #17841
---
 tmpl/sunstone-ldap_auth.conf | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tmpl/sunstone-ldap_auth.conf b/tmpl/sunstone-ldap_auth.conf
index 2644da5..766549c 100644
--- a/tmpl/sunstone-ldap_auth.conf
+++ b/tmpl/sunstone-ldap_auth.conf
@@ -30,6 +30,9 @@ server 1:
     # for Active Directory use this user_field instead
     #:user_field: 'sAMAccountName'
 
+    # Default group ID used for users in an AD group not mapped
+    :mapping_default: 1
+
 # List the order the servers are queried
 :order:
     - server 1

From 4271873d8d7fc9651ce7f8041322f5c4a9936638 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=ABl=20Cuissinat?= <joel.cuissinat@ac-dijon.fr>
Date: Wed, 16 Nov 2016 10:44:20 +0100
Subject: [PATCH 2/3] =?UTF-8?q?Correction=20test=20erron=C3=A9=20dans=20le?=
 =?UTF-8?q?=20template=20de=20la=20vue=20"admin"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Ref: #17853 @20m
---
 tmpl/admin.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tmpl/admin.yaml b/tmpl/admin.yaml
index dd8e3a5..981f8a1 100644
--- a/tmpl/admin.yaml
+++ b/tmpl/admin.yaml
@@ -219,7 +219,7 @@ tabs:
             scheduling: true
             hybrid: true
             other: true
-%if %%getVar('activer_oneflow','non')
+%if %%oneflow
     oneflow-templates-tab:
         panel_tabs:
             service_template_info_tab: true

From 8261ce4ba6077af057a1e49d07546af312db125d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabrice=20Barconni=C3=A8re?=
 <fabrice.barconniere@ac-dijon.fr>
Date: Wed, 16 Nov 2016 13:05:51 +0100
Subject: [PATCH 3/3] =?UTF-8?q?Le=20service=20oneflow=20n'est=20pas=20util?=
 =?UTF-8?q?isable=20dans=20la=20vue=20cloud=20fournie.=20On=20le=20d=C3=A9?=
 =?UTF-8?q?sactive=20dans=20cette=20vue.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

ref #17853 @1h
---
 tmpl/cloud.yaml           | 6 +-----
 tmpl/sunstone-server.conf | 2 --
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/tmpl/cloud.yaml b/tmpl/cloud.yaml
index 770fabd..a30471b 100644
--- a/tmpl/cloud.yaml
+++ b/tmpl/cloud.yaml
@@ -1,4 +1,3 @@
-%set oneflow = %%getVar('activer_oneflow','non') == 'oui'
 provision_logo: images/opennebula-5.0.png
 enabled_tabs:
     - provision-tab
@@ -29,9 +28,6 @@ tabs:
             vm_template_tab: false
             vm_log_tab: false
         provision_tabs:
-%if %%oneflow
-            flows: true
-%end if
             templates: true
         actions: &provisionactions
             # In the cloud view, delete is the equivalent
@@ -140,4 +136,4 @@ tabs:
             - 2         # Owner
             #- 3         # Group
             - 4         # Name
-            #- 5         # Labels
\ No newline at end of file
+            #- 5         # Labels
diff --git a/tmpl/sunstone-server.conf b/tmpl/sunstone-server.conf
index c5eeffe..cce60bd 100644
--- a/tmpl/sunstone-server.conf
+++ b/tmpl/sunstone-server.conf
@@ -183,9 +183,7 @@
 #    - other
 
 :routes:
-%if %%getVar('activer_oneflow', 'non') == 'oui'
     - oneflow
-%end if
 %if %%getVar('activer_market_views', 'non') == 'oui'
     - appmarket
 %end if