Créer l’utilisateur si il n’existe pas (ou mettre à jour son mot de passe)

Pour avoir l’opportunité contrôler le service creoled avant d’y faire
appel, test de la présence des bibliothèques d’un côté, et récupération
de faits avec creole d’un autre.

README.md

@@ -2,216 +2,5 @@
 
 Utilitaires pour gérer les modules EOLE à partir d’ansible
 
-## Alimentation de la configuration de Zéphir
+La description des éléments de la collection se trouve dans le fichier cadoles/eole/README.md
-### zephir_etab
 
-Le module a pour but la gestion des établissements.
-Un établissement est identifié par un numéro *rne*.
-
-``` plantuml
-object etablissements
-
-etablissements : rne (character varying(8) not null pkey)
-etablissements : libelle (character varying(200) not null)
-etablissements : type (integer not null references types_etab)
-etablissements : ville (character varying(50) not null)
-etablissements : cp (character varying(5) not null)
-etablissements : adresse     (character varying(100))
-etablissements : tel         (character varying(20))
-etablissements : fax         (character varying(20))
-etablissements : mail        (character varying(100))
-etablissements : responsable (character varying(30))
-etablissements : remarques   (text)
-
-object types_etab
-
-types_etab : id      (integer, not null)
-types_etab : libelle (character varying(80), not null)
-```
-
-Quoique les champs `libelle`, `type`, `ville`, `cp` soient également obligatoires à la création, ils ne sont pas distinctifs de l’établissement.
-Le champ type fait référence à la table `types_etab` qui contient déjà des valeurs appropriées pour le contexte de l’Éducation nationale.
-Aucune API n’est prévue pour modifier cette table.
-
-#### Fonctionnement du module
-
-Le module tire partie de l’API XMLRPC authentifiée accessible localement.
-Le module nécessite donc, outre les paramètres attendus par la base de données, des paramètres d’authentification.
-
-##### Implémentation cible
-
-``` flowchart
-st=>start: Entrée
-e=>end: Sortie
-createproxy=>operation: Création du proxy
-listetabs=>operation: Liste des établissements
-etabexist=>condition: L’établissement existe déjà ?
-samedata=>condition: Les données sont les mêmes ?
-doingnothing=>operation: Ne rien faire
-modifydata=>operation: Modification des données
-createetab=>operation: Création de l’établissement
-
-st->createproxy
-createproxy->listetabs
-listetabs->etabexist
-etabexist(yes)->samedata
-samedata(yes)->doingnothing
-doingnothing->e
-samedata(no)->modifydata
-modifydata->e
-etabexist(no)->createetab
-createetab->e
-```
-
-##### Implémentation actuelle
-
-``` flowchart
-st3=>start: start run_module
-io5=>inputoutput: input: 
-op8=>operation: key_mapping = {'rne': 'rne', 'libelle': 'libelle', 'ville': 'ville', 'cp': 'code_postal', 'type': 'etab_type', 'adresse': 'adresse', 'tel': 'tel', 'fax': 'fax', 'mail': 'mail', 'responsable': 'responsable', 'remarques': 'remarques'}
-op10=>operation: module_args = dict(zephir_user=dict(type='str', required=True), zephir_user_password=dict(type='str', required=True), rne=dict(type='str', required=True), libelle=dict(type='str', required=True), ville=dict(type='str', required=True), code_postal=dict(type='str', required=True), etab_type=dict(type='int', required=True), adresse=dict(type='str', required=False, default=''), tel=dict(type='str', required=False, default=''), fax=dict(type='str', required=False, default=''), mail=dict(type='str', required=False, default=''), responsable=dict(type='str', required=False, default=''), remarques=dict(type='str', required=False, default=''), state=dict(type='str', required=True, default='present'))
-op12=>operation: result = dict(changed=False, rne=None, msg='')
-op14=>operation: module = AnsibleModule(argument_spec=module_args, supports_check_mode=True)
-cond17=>operation: module.exit_json(**result) if  module.check_mode
-op27=>operation: port_zephir = str((int(config.PORT_ZEPHIR) + 1))
-op29=>operation: proxy_addr = 'http://{0}:{1}@localhost:{2}/'.format(module.params['zephir_user'], module.params['zephir_user_password'], port_zephir)
-op31=>operation: proxy = EoleProxy(proxy_addr)
-op33=>operation: (return_code, etabs) = proxy.etabs.get_etab()
-cond36=>operation: etabs = {m['rne']: m for m in etabs} if  return_code
-cond47=>condition: if (module.params['rne'] in etabs)
-op51=>operation: result['msg'] = 'Etab {} already exists'.format(module.params['rne'])
-op53=>operation: data_change = {}
-cond56=>condition: for (key, value) in etabs[module.params['rne']]
-cond73=>operation: data_change[key] = module.params[key_mapping[key]] if  (module.params[key_mapping[key]] != value)
-cond86=>operation: module.exit_json(**result) if  (not data_change)
-op99=>operation: (return_code, proxy_msg) = proxy.etabs.add_etab(module.params['rne'], module.params['libelle'], module.params['adresse'], module.params['ville'], module.params['code_postal'], module.params['tel'], module.params['fax'], module.params['mail'], module.params['responsable'], module.params['remarques'], module.params['etab_type'])
-cond102=>condition: if return_code
-op106=>operation: result['changed'] = True
-op108=>operation: result['rne'] = proxy_msg
-op110=>operation: result['msg'] = 'Etab {}'.format(module.params['rne'])
-sub119=>subroutine: module.exit_json(**result)
-e121=>end: end run_module
-op114=>operation: result['msg'] = 'Etab {} not created: {}'.format(module.params['libelle'], proxy_msg)
-sub116=>subroutine: module.fail_json(**result)
-
-st3->io5
-io5->op8
-op8->op10
-op10->op12
-op12->op14
-op14->cond17
-cond17->op27
-op27->op29
-op29->op31
-op31->op33
-op33->cond36
-cond36->cond47
-cond47(yes)->op51
-op51->op53
-op53->cond56
-cond56(yes)->cond73
-cond73->cond56
-cond56(no)->cond86
-cond86->op99
-op99->cond102
-cond102(yes)->op106
-op106->op108
-op108->op110
-op110->sub119
-sub119->e121
-cond102(no)->op114
-op114->sub116
-sub116->sub119
-cond47(no)->op99
-
-```
-
-### zephir_serveur
-
-### zephir_module
-
-### zephir_variante
-
-## Configuration d’un serveur
-
-### creoleset
-
-Le module a pour but de permettre la modification des variables de configuration creole.
-La difficulté réside dans les liens de dépendances qui peuvent exister entre variables et la nécessité de pouvoir faire des modifications par bloc, de façon atomique.
-
-``` flowchart
-start=>start: début d’exécution
-e=>end: fin d’exécution
-creole_loader=>operation: Création de l’objet config en lecture/écriture
-tri_variables=>operation: Tri des variables à modifier
-
-start->creole_loader
-creole_loader->tri_variables
-tri_variables->e
-```
-
-``` yaml
----
-- hosts: module_test
-  tasks:
-    - name: Configuration d’une variable isolée simple
-      creoleset:
-        variables:
-	  - name: "libelle_etab"
-	    value: "etab_test"
-
-    - name: Configuration d’une variable isolée multi
-      creoleset:
-        variables:
-	  - name: "adresse_ip_dns"
-	    value:
-	      - "192.168.0.1"
-	      - "192.168.232.2"
-
-    - name: Configuration d’un groupe de variables
-      creoleset:
-        variables:
-	  - name: "ip_ssh_eth0"
-	    value:
-	      - "192.168.0.0"
-	  - name: "netmask_ssh_eth0"
-	    value:
-	      - "255.255.0.0"
-
-    - name: Configuration avec variable nécessitant activation
-      creoleset:
-        variables:
-	  - name: "additional_repository_name"
-	    value: "Cadoles unstable"
-	  - name: "additional_repository_source"
-	    value: "deb https://vulcain.cadoles.com 2.7.2-unstable main"
-	  - name: "additional_repository_key_type"
-	    value: "URL de la clé"
-	  - name: "additional_repository_key_url"
-	    value: "https://vulcain.cadoles.com/cadoles.gpg"
-
-    - name: Configuration ajoutée
-      creoleset:
-        variables:
-	  - name: "ip_ssh_eth0"
-	    value: "10.253.30.0"
-	  - name: "netmask_ssh_eth0"
-	    value: "255.255.255.0"
-	state: present
-
-    - name: idempotence
-      creoleset:
-        variables:
-	  - name: "ip_ssh_eth0"
-	    value:
-	      - "192.168.0.0"
-	      - "10.253.30.0"
-	  - name: "netmask_ssh_eth0"
-	    value:
-	      - "255.255.0.0"
-	      - "255.255.255.0"
-```
-### zephir_register
-
-Module basé sur pexpect
-Il met en œuvre une série de questions articulées entre elles pour prendre en compte les enchaînements.

cadoles/eole/README.md

@@ -1,3 +1,308 @@
 # Ansible Collection - cadoles.eole
 
 Documentation for the collection.
+
+## Alimentation de la configuration de Zéphir
+### zephir_etab
+
+Le module a pour but la gestion des établissements.
+Un établissement est identifié par un numéro *rne*.
+
+``` plantuml
+object etablissements
+
+etablissements : rne (character varying(8) not null pkey)
+etablissements : libelle (character varying(200) not null)
+etablissements : type (integer not null references types_etab)
+etablissements : ville (character varying(50) not null)
+etablissements : cp (character varying(5) not null)
+etablissements : adresse     (character varying(100))
+etablissements : tel         (character varying(20))
+etablissements : fax         (character varying(20))
+etablissements : mail        (character varying(100))
+etablissements : responsable (character varying(30))
+etablissements : remarques   (text)
+
+object types_etab
+
+types_etab : id      (integer, not null)
+types_etab : libelle (character varying(80), not null)
+```
+
+Quoique les champs `libelle`, `type`, `ville`, `cp` soient également obligatoires à la création, ils ne sont pas distinctifs de l’établissement.
+Le champ type fait référence à la table `types_etab` qui contient déjà des valeurs appropriées pour le contexte de l’Éducation nationale.
+Aucune API n’est prévue pour modifier cette table.
+
+#### Fonctionnement du module
+
+Le module tire partie de l’API XMLRPC authentifiée accessible localement.
+Le module nécessite donc, outre les paramètres attendus par la base de données, des paramètres d’authentification.
+
+##### Implémentation cible
+
+``` flowchart
+st=>start: Entrée
+e=>end: Sortie
+createproxy=>operation: Création du proxy
+listetabs=>operation: Liste des établissements
+etabexist=>condition: L’établissement existe déjà ?
+samedata=>condition: Les données sont les mêmes ?
+doingnothing=>operation: Ne rien faire
+modifydata=>operation: Modification des données
+createetab=>operation: Création de l’établissement
+
+st->createproxy
+createproxy->listetabs
+listetabs->etabexist
+etabexist(yes)->samedata
+samedata(yes)->doingnothing
+doingnothing->e
+samedata(no)->modifydata
+modifydata->e
+etabexist(no)->createetab
+createetab->e
+```
+
+##### Implémentation actuelle
+
+``` flowchart
+st3=>start: start run_module
+io5=>inputoutput: input: 
+op8=>operation: key_mapping = {'rne': 'rne', 'libelle': 'libelle', 'ville': 'ville', 'cp': 'code_postal', 'type': 'etab_type', 'adresse': 'adresse', 'tel': 'tel', 'fax': 'fax', 'mail': 'mail', 'responsable': 'responsable', 'remarques': 'remarques'}
+op10=>operation: module_args = dict(zephir_user=dict(type='str', required=True), zephir_user_password=dict(type='str', required=True), rne=dict(type='str', required=True), libelle=dict(type='str', required=True), ville=dict(type='str', required=True), code_postal=dict(type='str', required=True), etab_type=dict(type='int', required=True), adresse=dict(type='str', required=False, default=''), tel=dict(type='str', required=False, default=''), fax=dict(type='str', required=False, default=''), mail=dict(type='str', required=False, default=''), responsable=dict(type='str', required=False, default=''), remarques=dict(type='str', required=False, default=''), state=dict(type='str', required=True, default='present'))
+op12=>operation: result = dict(changed=False, rne=None, msg='')
+op14=>operation: module = AnsibleModule(argument_spec=module_args, supports_check_mode=True)
+cond17=>operation: module.exit_json(**result) if  module.check_mode
+op27=>operation: port_zephir = str((int(config.PORT_ZEPHIR) + 1))
+op29=>operation: proxy_addr = 'http://{0}:{1}@localhost:{2}/'.format(module.params['zephir_user'], module.params['zephir_user_password'], port_zephir)
+op31=>operation: proxy = EoleProxy(proxy_addr)
+op33=>operation: (return_code, etabs) = proxy.etabs.get_etab()
+cond36=>operation: etabs = {m['rne']: m for m in etabs} if  return_code
+cond47=>condition: if (module.params['rne'] in etabs)
+op51=>operation: result['msg'] = 'Etab {} already exists'.format(module.params['rne'])
+op53=>operation: data_change = {}
+cond56=>condition: for (key, value) in etabs[module.params['rne']]
+cond73=>operation: data_change[key] = module.params[key_mapping[key]] if  (module.params[key_mapping[key]] != value)
+cond86=>operation: module.exit_json(**result) if  (not data_change)
+op99=>operation: (return_code, proxy_msg) = proxy.etabs.add_etab(module.params['rne'], module.params['libelle'], module.params['adresse'], module.params['ville'], module.params['code_postal'], module.params['tel'], module.params['fax'], module.params['mail'], module.params['responsable'], module.params['remarques'], module.params['etab_type'])
+cond102=>condition: if return_code
+op106=>operation: result['changed'] = True
+op108=>operation: result['rne'] = proxy_msg
+op110=>operation: result['msg'] = 'Etab {}'.format(module.params['rne'])
+sub119=>subroutine: module.exit_json(**result)
+e121=>end: end run_module
+op114=>operation: result['msg'] = 'Etab {} not created: {}'.format(module.params['libelle'], proxy_msg)
+sub116=>subroutine: module.fail_json(**result)
+
+st3->io5
+io5->op8
+op8->op10
+op10->op12
+op12->op14
+op14->cond17
+cond17->op27
+op27->op29
+op29->op31
+op31->op33
+op33->cond36
+cond36->cond47
+cond47(yes)->op51
+op51->op53
+op53->cond56
+cond56(yes)->cond73
+cond73->cond56
+cond56(no)->cond86
+cond86->op99
+op99->cond102
+cond102(yes)->op106
+op106->op108
+op108->op110
+op110->sub119
+sub119->e121
+cond102(no)->op114
+op114->sub116
+sub116->sub119
+cond47(no)->op99
+
+```
+
+### zephir_serveur
+
+### zephir_module
+
+### zephir_variante
+
+## Configuration d’un serveur
+
+### creoleset
+
+Le module a pour but de permettre la modification des variables de configuration creole.
+La difficulté réside dans les liens de dépendances qui peuvent exister entre variables et la nécessité de pouvoir faire des modifications par bloc, de façon atomique.
+
+``` flowchart
+start=>start: début d’exécution
+e=>end: fin d’exécution
+creole_loader=>operation: Création de l’objet config en lecture/écriture
+tri_variables=>operation: Tri des variables à modifier
+
+start->creole_loader
+creole_loader->tri_variables
+tri_variables->e
+```
+
+``` yaml
+---
+- hosts: module_test
+  tasks:
+    - name: Test if minimal config is already done
+      stat:
+        path: "/etc/eole/config.eol"
+      register: configeol
+    - name: Configuration minimale
+      creoleset:
+        variables:
+          - name: "numero_etab"
+            value: "0000000B"
+          - name: "libelle_etab"
+            value: "bbohard_etab"
+          - name: "nom_academie"
+            value: "bbohard"
+          - name: "nom_domaine_local"
+            value: "bbohard.lan"
+          - name: "eth0_method"
+            value: "dhcp"
+          - name: "ip_ssh_eth0"
+            value:
+              - "192.168.122.0"
+          - name: "netmask_ssh_eth0"
+            value:
+              - "255.255.255.0"
+          - name: "ip_admin_eth0"
+            value: "192.168.122.0"
+          - name: "netmask_admin_eth0"
+            value: "255.255.255.0"
+          - name: "activer_exim_relay_smtp"
+            value: "non"
+          - name: "nom_machine"
+            value: "{{ hostname }}"
+      when: not configeol.stat.exists
+    - name: Set some hostnames
+      creoleset:
+        variables:
+          - name: activer_ajout_hosts
+            value: oui
+          - name: nom_court_hosts
+            value:
+              - minio-a1
+              - minio-a2
+              - minio-b1
+              - minio-b2
+          - name: nom_long_hosts
+            value:
+              - minio-a1.cadoles.lan
+              - minio-a2.cadoles.lan
+              - minio-b1.cadoles.lan
+              - minio-b2.cadoles.lan
+          - name: adresse_ip_hosts
+            value:
+              - 10.10.0.1
+              - 10.10.0.2
+              - 10.10.0.3
+              - 10.10.0.4
+
+    - name: Configuration d’une variable isolée simple
+      creoleset:
+        variables:
+          - name: "libelle_etab"
+            value: "etab_test"
+
+    - name: Configuration d’une variable isolée multi
+      creoleset:
+        variables:
+          - name: "adresse_ip_dns"
+            value:
+              - "1.1.1.1"
+              - "8.8.8.8"
+
+    - name: Configuration d’un groupe de variables
+      creoleset:
+        variables:
+          - name: "ip_ssh_eth0"
+            value:
+              - "192.168.0.0"
+          - name: "netmask_ssh_eth0"
+            value:
+              - "255.255.0.0"
+    - name: Debug
+      shell:
+        cmd: "CreoleGet ip_ssh_eth0"
+
+    - name: Configuration avec variable nécessitant activation
+      creoleset:
+        variables:
+          - name: "additional_repository_name"
+            value: "Cadoles unstable"
+          - name: "additional_repository_source"
+            value: "deb https://vulcain.cadoles.com 2.7.0-unstable main"
+          - name: "additional_repository_key_type"
+            value: "URL de la clé"
+          - name: "additional_repository_key_url"
+            value: "https://vulcain.cadoles.com/cadoles.gpg"
+        state: present
+
+    - name: Configuration ajoutée
+      creoleset:
+        variables:
+          - name: 'additional_repository_name'
+            value: 'mariadb'
+          - name: 'additional_repository_source'
+            value: 'deb http://mariadb.mirrors.ovh.net/MariaDB/repo/10.3/ubuntu bionic main'
+          - name: 'additional_repository_key_type'
+            value: 'serveur de clés'
+          - name: 'additional_repository_key_signserver'
+            value: 'hkp://keyserver.ubuntu.com:80'
+          - name: 'additional_repository_key_fingerprint'
+            value: 'F1656F24C74CD1D8'
+        state: present
+    - name: Configuration vidée
+      creoleset:
+        variables:
+          - name: 'additional_repository_name'
+            value: []
+          - name: 'additional_repository_source'
+            value: []
+          - name: 'additional_repository_key_type'
+            value: []
+          - name: 'additional_repository_key_fingerprint'
+            value: []
+          - name: 'additional_repository_key_url'
+            value: []
+
+    - name: Configuration ajoutée
+      creoleset:
+        variables:
+          - name: "ip_ssh_eth0"
+            value: "10.253.30.0"
+          - name: "netmask_ssh_eth0"
+            value: "255.255.255.0"
+        state: present
+
+    - name: idempotence
+      creoleset:
+        variables:
+          - name: "ip_ssh_eth0"
+            value:
+              - "192.168.0.0"
+              - "10.10.0.0"
+          - name: "netmask_ssh_eth0"
+            value:
+              - "255.255.0.0"
+              - "255.255.255.0"
+```
+
+La configuration des groupes nécessite de toujours renseigner les variables maîtres
+
+### zephir_register
+
+Module basé sur pexpect
+Il met en œuvre une série de questions articulées entre elles pour prendre en compte les enchaînements.

cadoles/eole/plugins/modules/creoleset.py

@@ -135,6 +135,8 @@ def run_module():
         var_path = d.impl_get_path_by_opt(variable)
         old_value = c.getattr(var_path)
         new_value_set = {var_path: {'value': new_value, 'sub': [(d.impl_get_path_by_opt(sub), variables[sub]) for sub in sub_variables]}}
+        if sys.version_info < (3,):
+            new_value_set = yml_params_to_unicode(new_value_set)
 
         if variable.impl_is_multi():
             method = module.params['state']

cadoles/eole/plugins/modules/eole_facts.py

@@ -86,19 +86,17 @@ def run_module():
     try:
         from creole.eoleversion import EOLE_RELEASE
         from creole.client import CreoleClient
-        module_eole = CreoleClient().get_creole('eole_module')
-
         result['ansible_facts'] = {
                 'is_eole': True,
-                'module_eole': module_eole,
                 'release_eole': EOLE_RELEASE,
                 }
     except:
         result['ansible_facts'] = {'is_eole': False}
      
+    module.exit_json(**result)
+
     # in the event of a successful module execution, you will want to
     # simple AnsibleModule.exit_json(), passing the key/value results
-    module.exit_json(**result)
 
 
 def main():

cadoles/eole/plugins/modules/eole_module_facts.py

@@ -0,0 +1,93 @@
+#!/usr/bin/python
+
+# Copyright: (c) 2021, Cadoles <contact@cadoles.com>
+# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
+
+DOCUMENTATION = r'''
+---
+module: eole_module_facts
+
+short_description: Gathers facts about EOLE modules
+
+version_added: "1.0.0"
+
+description: Determines which EOLE module targeted server is.
+
+author:
+    - Benjamin Bohard
+'''
+EXAMPLES = r'''
+- name: Return ansible_facts
+  cadoles.eole.eole_module_facts:
+'''
+
+RETURN = r'''
+# These are examples of possible return values, and in general should use other names for return values.
+ansible_facts:
+  description: Facts to add to ansible_facts.
+  returned: always
+  type: dict
+  contains:
+    module_eole:
+      description: eole module facts about operating system.
+      type: str
+      returned: when operating system eole module fact is present
+      sample: 'eolebase'
+'''
+
+from ansible.module_utils.basic import AnsibleModule
+
+
+def run_module():
+    # define available arguments/parameters a user can pass to the module
+    module_args = dict()
+
+    # seed the result dict in the object
+    # we primarily care about changed and state
+    # changed is if this module effectively modified the target
+    # state will include any data that you want your module to pass back
+    # for consumption, for example, in a subsequent task
+    result = dict(
+        changed=False,
+        ansible_facts=dict(),
+    )
+
+    # the AnsibleModule object will be our abstraction working with Ansible
+    # this includes instantiation, a couple of common attr would be the
+    # args/params passed to the execution, as well as if the module
+    # supports check mode
+    module = AnsibleModule(
+        argument_spec=module_args,
+        supports_check_mode=True
+    )
+
+    # if the user is working with this module in only check mode we do not
+    # want to make any changes to the environment, just return the current
+    # state with no modifications
+    if module.check_mode:
+        module.exit_json(**result)
+
+    # manipulate or modify the state as needed (this is going to be the
+    # part where your module will do what it needs to do)
+    from creole.eoleversion import EOLE_RELEASE
+    from creole.client import CreoleClient
+
+    module_eole = CreoleClient().get_creole('eole_module')
+
+    result['ansible_facts'] = {
+            'module_eole': module_eole,
+            }
+    module.exit_json(**result)
+
+    # in the event of a successful module execution, you will want to
+    # simple AnsibleModule.exit_json(), passing the key/value results
+
+
+def main():
+    run_module()
+
+
+if __name__ == '__main__':
+    main()

cadoles/eole/plugins/modules/instance.py

@@ -68,6 +68,18 @@ import re
 ansi_escape = re.compile(r'\x1B(?:[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])')
 
 
+def yml_params_to_unicode(param):
+    def convert_param(param):
+        if isinstance(param, str):
+            return param.decode('utf-8')
+        if isinstance(param, list):
+            return [convert_param(p) for p in param]
+        if isinstance(param, dict):
+            return {convert_param(key): convert_param(value) for key,value in param.items()}
+        return param
+    return convert_param(param)
+
+
 class ExpectationCollection:
     def __init__(self):
         self.expectations_lookup = {}
@@ -75,7 +87,7 @@ class ExpectationCollection:
     def add_expectation(self, expectation):
         if expectation.get_pattern() in self.expectations_lookup:
             if expectation.context in [exp.context for exp in self.expectations_lookup[expectation.get_pattern()]]:
-                print(f'Can not add {expectation} to collection')
+                print('Can not add {} to collection'.format(expectation))
                 return False
         self.expectations_lookup[expectation.get_pattern()] = self.expectations_lookup.setdefault(expectation.get_pattern(), []) + [expectation]
         return True
@@ -123,7 +135,7 @@ class Expectation:
         self.next = {}
 
     def get_pattern(self, previous_answer=None):
-        return re.compile(f'(.*){re.escape(self.pattern.format(variable=previous_answer))}(.*)')
+        return re.compile(r'(.*){}(.*)'.format(re.escape(self.pattern.format(variable=previous_answer))))
 
     def set_next_expectation(self, expectation, triggers=None):
         if not isinstance(triggers, list):
@@ -132,19 +144,19 @@ class Expectation:
             self.next[trigger] = expectation
 
     def set_response(self, response):
-        print(f'Setting {response} for {self.pattern}')
+        print('Setting {} for {}'.format(response, self.pattern))
         self.response = response
 
     def expect(self, spawned, previous_answer=None):
-        print(f'-> expecting next "{self.pattern.format(variable=previous_answer)}"')
+        print('-> expecting next "{}"'.format(self.pattern.format(variable=previous_answer)))
         p = spawned.expect([pexpect.EOF, pexpect.TIMEOUT, self.get_pattern(previous_answer=previous_answer)])
         if p not in [0, 1]:
             self.answer(spawned)
         else:
-            print(f'-> before: {spawned.before}\n-> after: {spawned.after}\n-> {self.pattern}')
+            print('-> before: {}\n-> after: {}\n-> {}'.format(spawned.before, spawned_after, self.pattern))
 
     def answer(self, spawned):
-        print(f'-> answering "{self.response}" to "{spawned.after}"')
+        print('-> answering "{}" to "{}"'.format(self.response, spawned.after))
         if self.response is not None:
             spawned.sendline(self.response)
         if self.response in self.next:
@@ -160,6 +172,8 @@ class Expectation:
             return False
         context.reverse()
         for index, c in enumerate(self.context[len(self.context)-2::-1]):
+            if sys.version_info < (3,):
+                c = c.decode('utf-8')
             if c != ansi_escape.sub('', context[index]):
                 return False
         return True
@@ -289,6 +303,7 @@ def run_module():
         changed=False,
         module='',
         msg='',
+        debug='',
     )
 
     # the AnsibleModule object will be our abstraction working with Ansible
@@ -309,17 +324,17 @@ def run_module():
             result['module'] = module.params["module"]
             if module.params.get('variables', None) and not set(module.params['variables'].keys()).issubset(set(expectations.get_exposed_expectation_names())):
                 unknown_variables = list(set(module.params['variables'].keys()).difference(set(expectations.get_exposed_expectation_names())))
-                result['msg'] += f"Variables {unknown_variables} not available\n"
+                result['msg'] += "Variables {} not available\n".format(unknown_variables)
             else:
                 for variable in module.params.get('variables', {}).keys():
-                    result['msg'] += f"Overloading variable {variable}\n"
+                    result['msg'] += "Overloading variable {}\n".format(variable)
         else:
-            result['msg'] += f'Module {module.module} not supported\n'
+            result['msg'] += 'Module {} not supported\n'.format(module.module)
         module.exit_json(**result)
 
     
     if module.params['module'] not in supported_modules:
-        result['msg'] += f"Unsupported module {module.params['module']}\n"
+        result['msg'] += "Unsupported module {}\n".format(module.params['module'])
         module.fail_json(**result)
     else:
         result['module'] = module.params['module']
@@ -327,7 +342,7 @@ def run_module():
     if module.params.get('variables', None):
         if not set(module.params['variables'].keys()).issubset(set(expectations.get_exposed_expectation_names())):
             unknown_variables = list(set(module.params['variables'].keys()).difference(set(expectations.get_exposed_expectation_names())))
-            result['msg'] += f"Variables {unknown_variables} not available\n"
+            result['msg'] += "Variables {} not available\n".format(unknown_variables)
             module.fail_json(**result)
         else:
             for expectation_name, response in module.params['variables'].items():
@@ -342,7 +357,7 @@ def run_module():
             if p == 0:
                 break
             if p == 1:
-                print(f'Some missing expectations for {instance_process.before}{instance_process.after}')
+                print('Some missing expectations for {}{}'.format(instance_process.before, instance_process.after))
                 break
             pattern = patterns[p]
             for expectation in expectations.get_expectations_by_pattern(patterns[p]):
@@ -351,10 +366,10 @@ def run_module():
                     break
             some_index += 1
         result['changed'] = True
-        result['msg'] += f"Module {result['module']} instanciated"
+        result['msg'] += "Module {} instanciated".format(result['module'])
         module.exit_json(**result)
     except Exception as err:
-        result['msg'] += err
+        result['msg'] += str(err)
         result['changed'] = True
         module.fail_json(**result)
 

cadoles/eole/plugins/modules/zephir_user.py

@@ -29,6 +29,10 @@ options:
         description: User name
         required: true
         type: str
+    user_password:
+        description: user password
+        required: true
+        type: str
     permissions:
         description: permissions given to user
         required: true
@@ -53,6 +57,7 @@ EXAMPLES = r'''
     zephir_user: admin_zephir
     zephir_user_password: eole
     user: admin
+    user_password: admin
     permissions:
       - "Lecture"
 '''
@@ -75,6 +80,7 @@ from ansible.module_utils.basic import AnsibleModule
 
 from zephir.eolerpclib import EoleProxy
 from zephir.web import config
+from zephir.utils.ldap_user import add_user, encrypt_passwd
 
 def run_module():
     # define available arguments/parameters a user can pass to the module
@@ -93,11 +99,11 @@ def run_module():
             "Gestion des identifiants ENT": 12,
             "Gestion de la réplication LDAP": 13,
             "Gestion de la synchronisation AAF": 14,
-            "Ecriture (serveurs)": 15,
+            "Ecriture (serveurs)": 21,
-            "Ecriture (modules)": 16,
+            "Ecriture (modules)": 22,
-            "Ecriture (etablissements)": 17,
+            "Ecriture (etablissements)": 23,
-            "Actions sans modification de configuration": 18,
+            "Actions sans modification de configuration": 31,
-            "Mise à jour du mot de passe (annuaire local)": 19,
+            "Mise à jour du mot de passe (annuaire local)": 40,
             }
     mapped_keys = {value: key for key, value in key_mapping.items()}
 
@@ -105,6 +111,7 @@ def run_module():
             zephir_user=dict(type='str', required=True),
             zephir_user_password=dict(type='str', required=True),
             user=dict(type='str', required=True),
+            user_password=dict(type='str', required=True),
             permissions=dict(type='list', required=True),
             state=dict(type='str', required=False, default='present'),
     )
@@ -138,7 +145,9 @@ def run_module():
     proxy_addr = "http://{0}:{1}@localhost:{2}/".format(module.params['zephir_user'], module.params['zephir_user_password'], port_zephir)
     proxy = EoleProxy(proxy_addr)
 
-    return_code, permissions = proxy.users.get_permissions(module.params['user'])
+    add_user(module.params['user'], encrypt_passwd(module.params['user_password']))
+
+    return_code, permissions = proxy.get_permissions(module.params['user'])
     if return_code:
         result['user'] = module.params['user']
         result['permissions'] = [mapped_keys[p] for p in permissions]
@@ -153,7 +162,7 @@ def run_module():
         elif module.params['state'] == 'absent':
             permissions = old_permissions.difference(set(new_permissions))
 
-    return_code, proxy_msg = proxy.users.save_permissions(str(list(permissions)))
+    return_code, proxy_msg = proxy.save_permissions(module.params['user'], str(list(permissions)))
     if return_code:
         result['changed'] = True
         result['permissions'] = [mapped_keys[p] for p in permissions]