Remove ara-wrapper (#410)

This reverts commit b4c7692.
This reverts commit 29bfc72.

Signed-off-by: Christian Berendt <berendt@osism.tech>

.flake8

@@ -1,3 +1,3 @@
 [flake8]
 max-line-length = 200
-ignore = F401
+# ignore = F841 W503

Containerfile

@@ -159,6 +159,9 @@ mkdir -p \
 mkdir -p /tests
 cp -r /repository/tests/* /tests
 
+# copy ara configuration
+python3 -m ara.setup.env >> /ansible/ara.env
+
 # prepare list of playbooks
 python3 /src/render-playbooks.py
 

files/ara.env

@@ -4,4 +4,3 @@ export ARA_IGNORED_FILES=.ansible/tmp,vault.yaml,vault.yml
 export ARA_IGNORED_ARGUMENTS=vault_password_files
 export ARA_LOCALHOST_AS_HOSTNAME=true
 export ARA_LOCALHOST_AS_HOSTNAME_FORMAT=fqdn
-export ANSIBLE_CALLBACK_PLUGINS=${ANSIBLE_CALLBACK_PLUGINS:-}${ANSIBLE_CALLBACK_PLUGINS+:}/src/ara-callback

files/src/render-python-requirements.py

@@ -24,13 +24,11 @@
 # render requirements.txt
 
 template = environment.get_template("requirements.txt.j2")
-result = template.render(
-    {
-        "ansible_version": ceph_versions["ansible_version"],
-        "ansible_core_version": ceph_versions["ansible_core_version"],
-        "osism_projects": versions["osism_projects"],
-        "version": VERSION,
-    }
-)
+result = template.render({
+  'ansible_version': ceph_versions['ansible_version'],
+  'ansible_core_version': ceph_versions['ansible_core_version'],
+  'osism_projects': versions['osism_projects'],
+  'version': VERSION,
+})
 with open("/requirements.txt", "w+") as fp:
     fp.write(result)

files/src/render-versions.py

@@ -23,32 +23,30 @@
 template = environment.get_template("versions.yml.j2")
 
 if VERSION == "latest":
-    result = template.render(
-        {
-            "ceph_ansible_version": CEPH_VERSION,
-            "ceph_image_version": CEPH_VERSION,
-            "cephclient_version": CEPH_VERSION,
-        }
-    )
+    result = template.render({
+      'ceph_ansible_version': CEPH_VERSION,
+      'ceph_image_version': CEPH_VERSION,
+      'cephclient_version': CEPH_VERSION
+    })
 else:
     with open("/release/%s/ceph.yml" % VERSION, "rb") as fp:
         versions_ceph = yaml.load(fp, Loader=yaml.FullLoader)
 
-    result = template.render(
-        {
-            "ceph_ansible_version": versions["manager_version"],
-            "ceph_image_version": versions_ceph["docker_images"]["ceph"],
-            "ceph_version": versions_ceph["ceph_version"],
-            "cephclient_version": versions_ceph["docker_images"]["cephclient"],
-        }
-    )
+    result = template.render({
+      'ceph_ansible_version': versions['manager_version'],
+      'ceph_image_version': versions_ceph['docker_images']['ceph'],
+      'ceph_version': versions_ceph['ceph_version'],
+      'cephclient_version': versions_ceph['docker_images']['cephclient']
+    })
 
 with open("/ansible/group_vars/all/versions.yml", "w+") as fp:
     fp.write(result)
 
 # render motd
 
 template = environment.get_template("motd.j2")
-result = template.render({"manager_version": versions["manager_version"]})
+result = template.render({
+  'manager_version': versions['manager_version']
+})
 with open("/etc/motd", "w+") as fp:
     fp.write(result)