From 64f6471cdeb1cd6af7ce21773a1578607e00cad1 Mon Sep 17 00:00:00 2001 From: Philippe Caseiro Date: Wed, 11 May 2016 10:55:38 +0200 Subject: [PATCH 1/9] Faire remonter le dictionnaire dans l'ordre de traitement MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Ce dictionnaire doit être traité avant 30_hapy-master.xml (dico du module hapy-master) --- dicos/{99_one-master.xml => 29_one-master.xml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename dicos/{99_one-master.xml => 29_one-master.xml} (100%) diff --git a/dicos/99_one-master.xml b/dicos/29_one-master.xml similarity index 100% rename from dicos/99_one-master.xml rename to dicos/29_one-master.xml From 83eb1511fb0d91bac6e3a0594559620a6a7bd41f Mon Sep 17 00:00:00 2001 From: Philippe Caseiro Date: Wed, 11 May 2016 11:01:33 +0200 Subject: [PATCH 2/9] Correction de l'utilisation de variables d'autres dictionnaires MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Par sécurité et pour éviter les problèmes j'utilise getVar pour les variables qui ne sont pas fournient par le dico du projet. ref #16117 @20m --- tmpl/oned.conf | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tmpl/oned.conf b/tmpl/oned.conf index 23a4bee..2e619ea 100644 --- a/tmpl/oned.conf +++ b/tmpl/oned.conf @@ -710,7 +710,11 @@ HM_MAD = [ #******************************************************************************* AUTH_MAD = [ executable = "one_auth_mad", +%if %%getVar('sunstone_auth_modes', 'non') == 'non' authn = "server_cipher,default,%%sunstone_auth_modes" +%else + authn = "server_cipher,default,%%getVar('sunstone_auth_modes','')" +%end if ] SESSION_EXPIRATION_TIME = 900 From 390e5e520008e2261a5b2a93996c5bed9dc888d0 Mon Sep 17 00:00:00 2001 From: Philippe Caseiro Date: Wed, 11 May 2016 11:07:13 +0200 Subject: [PATCH 3/9] Correction de la configuration oned --- tmpl/oned.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tmpl/oned.conf b/tmpl/oned.conf index 2e619ea..2a34371 100644 --- a/tmpl/oned.conf +++ b/tmpl/oned.conf @@ -711,7 +711,7 @@ HM_MAD = [ AUTH_MAD = [ executable = "one_auth_mad", %if %%getVar('sunstone_auth_modes', 'non') == 'non' - authn = "server_cipher,default,%%sunstone_auth_modes" + authn = "server_cipher,default %else authn = "server_cipher,default,%%getVar('sunstone_auth_modes','')" %end if From 793f021a8da710dfb68c08d7cfeef91184d1013e Mon Sep 17 00:00:00 2001 From: Philippe Caseiro Date: Wed, 11 May 2016 11:15:07 +0200 Subject: [PATCH 4/9] Correction de l'utilisation de CreoleGet --- preservice/30-one-auth | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/preservice/30-one-auth b/preservice/30-one-auth index 6b167d6..dc5ddb0 100644 --- a/preservice/30-one-auth +++ b/preservice/30-one-auth @@ -1,6 +1,6 @@ #!/bin/bash -auth_mode="$(CreoleGet sunstone_auth_modes)" +auth_mode="$(CreoleGet sunstone_auth_modes '')" unlink /var/lib/one/remotes/auth/default 2>/dev/null if [ -z "${auth_mode}" ]; then From fa3e60b0c5b6d12ff1f03c3dd0b0f724ccccc1d0 Mon Sep 17 00:00:00 2001 From: Philippe Caseiro Date: Wed, 11 May 2016 11:22:05 +0200 Subject: [PATCH 5/9] Correction syntaxique dans le template oned.conf --- tmpl/oned.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tmpl/oned.conf b/tmpl/oned.conf index 2a34371..381fc86 100644 --- a/tmpl/oned.conf +++ b/tmpl/oned.conf @@ -711,7 +711,7 @@ HM_MAD = [ AUTH_MAD = [ executable = "one_auth_mad", %if %%getVar('sunstone_auth_modes', 'non') == 'non' - authn = "server_cipher,default + authn = "server_cipher,default" %else authn = "server_cipher,default,%%getVar('sunstone_auth_modes','')" %end if From 9004d3004b92d33a968240b90a3b705ec9ef6c61 Mon Sep 17 00:00:00 2001 From: Philippe Caseiro Date: Wed, 11 May 2016 11:31:53 +0200 Subject: [PATCH 6/9] =?UTF-8?q?Sur=20le=20module=20hapy-master=20il=20ne?= =?UTF-8?q?=20faut=20pas=20joindre=20l'h=C3=B4te=20local=20au=20cluster?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ref #16117 --- postservice/30-one-mng | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/postservice/30-one-mng b/postservice/30-one-mng index a288e72..f02aeca 100755 --- a/postservice/30-one-mng +++ b/postservice/30-one-mng @@ -105,7 +105,7 @@ function get_cluster_id_by_name() cmd="onecluster" opt="show ${name}" opt="list -l ID,NAME -f NAME=${name} --csv" - + res=$(${cmd} ${opt} --user ${AUTH%:*} --password ${AUTH#*:} | awk -F ',' '/^[0-9]/ { print $1 }') if [[ ${?} -eq 0 ]] @@ -431,8 +431,11 @@ function main() # # Creating Host # - host=$(CreoleGet nom_machine) - manage_host ${host} + if [[ $(CreoleGet eole_module non) != 'hapy-master' ]] + then + host=$(CreoleGet nom_machine) + manage_host ${host} + fi # # Attaching Host to the Cluster From 6fc9b508a315f54316ff9c1fbbc361297b7d9984 Mon Sep 17 00:00:00 2001 From: Philippe Caseiro Date: Wed, 11 May 2016 13:52:17 +0200 Subject: [PATCH 7/9] Correction du script diagnose MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Affiche une erreur sur hapy-master car oneflow n'est pas installé. ref #16117 @20m --- diagnose/04-virtualisation | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/diagnose/04-virtualisation b/diagnose/04-virtualisation index a0fbace..c720030 100644 --- a/diagnose/04-virtualisation +++ b/diagnose/04-virtualisation @@ -45,7 +45,7 @@ TestServiceStatus "OpenNebula" opennebula TestService "XMLRPC" "localhost:2633" TestService "Sunstone" $(CreoleGet "ip_sunstone"):$(CreoleGet "port_sunstone") TestService "Proxy VNC" $(CreoleGet "ip_sunstone"):$(CreoleGet "vnc_proxy_port_sunstone") -if [ "$(CreoleGet 'activer_oneflow')" == 'oui' ]; then +if [ "$(CreoleGet 'activer_oneflow' 'non')" == 'oui' ]; then TestService "OneFlow" $(CreoleGet "ip_oneflow"):$(CreoleGet "port_oneflow") fi echo "" From 873ef553b57a8a8e69f60d30012287f3d13c712c Mon Sep 17 00:00:00 2001 From: Philippe Caseiro Date: Tue, 24 May 2016 14:15:59 +0200 Subject: [PATCH 8/9] Suppression d'une variable inutile onedb_version MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cette variable n'est pas utile le travail de vérification est fait par l'outil OpenNebula. ref #9456 @10m --- dicos/29_one-master.xml | 3 --- 1 file changed, 3 deletions(-) diff --git a/dicos/29_one-master.xml b/dicos/29_one-master.xml index 297fb67..475e444 100644 --- a/dicos/29_one-master.xml +++ b/dicos/29_one-master.xml @@ -78,9 +78,6 @@ 2.5.2 - Configuration du pilote (Master) From 16de49e4746fa6c85a637d80c193a046c9351ae2 Mon Sep 17 00:00:00 2001 From: Daniel Dehennin Date: Fri, 17 Jun 2016 09:59:43 +0200 Subject: [PATCH 9/9] =?UTF-8?q?Ne=20pas=20mettre=20=C3=A0=20jour=20les=20A?= =?UTF-8?q?R=20des=20r=C3=A9seaux=20L2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Un reconfigure ajoute l’AR en tant qu’attribut de contextualisation. Il ne faut pas ajouter l’AR lors de la mise à jour de la définition du réseau. * postservice/31-one-netmng (OneNetworkL2.create_template): Test du mode mise à jour avant d’ajouter l’AR au modèle du réseau. Ref: #16275 --- postservice/31-one-netmng | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/postservice/31-one-netmng b/postservice/31-one-netmng index e41b9bf..4f366fa 100755 --- a/postservice/31-one-netmng +++ b/postservice/31-one-netmng @@ -271,7 +271,7 @@ class OneNetworkL2(OneNetwork): template.write('VLAN_TAGGED_ID = "{0}""\n'.format(self.trunk)) template.write('BRIDGE = {0}\n'.format(self.swname)) - if self.net_size: + if update is False and self.net_size: template.write("AR=[\n") template.write(' TYPE = "ETHER",\n')