From 856607fc5291ae2d3d9e8889e2aa0f2fa22f1a85 Mon Sep 17 00:00:00 2001
From: Emmanuel Garette <egarette@cadoles.com>
Date: Sat, 1 Oct 2022 19:29:50 +0200
Subject: [PATCH] ansible integration

---
 seed/base-machine/dictionaries/12-base.xml    |  1 +
 seed/base-machine/funcs/funcs.py              |  2 +-
 .../manual/install/install_machine            | 24 ++++++++++---------
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/seed/base-machine/dictionaries/12-base.xml b/seed/base-machine/dictionaries/12-base.xml
index f2dbdf3..b81e59c 100644
--- a/seed/base-machine/dictionaries/12-base.xml
+++ b/seed/base-machine/dictionaries/12-base.xml
@@ -9,6 +9,7 @@
     <variable name="hide_secret" type="boolean" description="Les secrets sont obscurcis" mode="expert" help="Obscurcir les secrets peut permettre de générer des configurations diffusable sans problème de confidentialité ou pour comparer deux configurations générés à des moments différents">
       <value>False</value>
     </variable>
+    <variable name="module_name" type="string" hidden="True" provider="global:module_name" mandatory="True"/>
     <family name="network" description="Réseau">
       <variable name="server_name" type="domainname" hidden="True" provider="global:server_name" mandatory="True"/>
       <variable name="zones_list" type="string" multi="True" description="Liste de toutes les zones" mandatory="True" hidden="True" provider="global:zones_name"/>
diff --git a/seed/base-machine/funcs/funcs.py b/seed/base-machine/funcs/funcs.py
index 8e67ffd..11cbccc 100644
--- a/seed/base-machine/funcs/funcs.py
+++ b/seed/base-machine/funcs/funcs.py
@@ -9,7 +9,7 @@ from os import makedirs as _makedirs
 #from risotto.utils import ZONES_SERVER
 
 
-_HERE = _dirname(_abspath(__main__.__file__))
+_HERE = _dirname(_dirname(_abspath(__main__.__file__)))
 _PASSWORD_DIR = _join(_HERE, 'password')
 
 
diff --git a/seed/base-machine/manual/install/install_machine b/seed/base-machine/manual/install/install_machine
index d6aec7b..0c38aca 100755
--- a/seed/base-machine/manual/install/install_machine
+++ b/seed/base-machine/manual/install/install_machine
@@ -2,6 +2,7 @@
 HOST_NAME=$1
 IMAGE_NAME=$2
 MACHINE=$3
+exit 0
 . config.sh
 . config_machine.sh
 if [ -z "$MACHINE" ]; then
@@ -40,24 +41,25 @@ fi
 if [ "$NEW_CONF" = true ]; then
     echo "  - delete old settings"
     ./diff.py "$MACHINE" "$MACHINE_RISOTTO_CONFIG_DIR" "$MACHINE_RISOTTO_CONFIG_DIR_LOCAL" > "$MACHINE_RISOTTO_CONFIG_DIR"_changelog.md
-    rm -rf "$MACHINE_RISOTTO_CONFIG_DIR"
+#    rm -rf "$MACHINE_RISOTTO_CONFIG_DIR"
 fi
 
-cp -a "$MACHINE_NAME_NSPAWN_LOCAL" "$MACHINE_NAME_NSPAWN"
-cp -a "$MACHINE_NAME_SCRIPT_LOCAL" "$MACHINE_NAME_SCRIPT"
-if [ ! -d "$MACHINE_RISOTTO_CONFIG_DIR" ]; then
-    cp -a "$MACHINE_RISOTTO_CONFIG_DIR_LOCAL" "$MACHINE_RISOTTO_CONFIG_DIR"
-fi
-if [ ! -d "$MACHINE_RISOTTO_SRV_DIR" ] && [ -d "$MACHINE_RISOTTO_SRV_DIR_LOCAL" ]; then
-    mkdir -p "$MACHINE_RISOTTO_SRV_DIR"
-fi
-mkdir -p "$RISOTTO_JOURNALD_DIR"
+#cp -a "$MACHINE_NAME_NSPAWN_LOCAL" "$MACHINE_NAME_NSPAWN"
+#cp -a "$MACHINE_NAME_SCRIPT_LOCAL" "$MACHINE_NAME_SCRIPT"
+#if [ ! -d "$MACHINE_RISOTTO_CONFIG_DIR" ]; then
+#    cp -a "$MACHINE_RISOTTO_CONFIG_DIR_LOCAL" "$MACHINE_RISOTTO_CONFIG_DIR"
+#fi
+#if [ ! -d "$MACHINE_RISOTTO_SRV_DIR" ] && [ -d "$MACHINE_RISOTTO_SRV_DIR_LOCAL" ]; then
+#    mkdir -p "$MACHINE_RISOTTO_SRV_DIR"
+#fi
+#mkdir -p "$RISOTTO_JOURNALD_DIR"
 if [ ! -d "$MACHINE_MACHINES_DIR" ]; then
     cd "$MACHINES_DIR"
+    mkdir "$IMAGE_NAME"
+    cd "$IMAGE_NAME"
     tar xf "$IMAGE_NAME_RISOTTO_IMAGE_NAME"
     mkdir -p "$SHA_MACHINE_DIR"
     cp -a "$IMAGE_NAME_RISOTTO_IMAGE_NAME".sha "$SHA_MACHINE"
-    mv "$IMAGE_NAME" "$MACHINE_MACHINES_DIR"
     cd - > /dev/null
 fi