Fix/ansible outputs

stackl/agent/agent/kubernetes/handlers/ansible_handler.py

@@ -273,24 +273,17 @@ def parse(self, inventory, loader, path, cache):
 """
 
 playbook_include_role = """
-- hosts: localhost
-  connection: local
+- hosts: "{{ pattern }}"
   gather_facts: no
   tasks:
     - include_role:
         name: "{{ ansible_role }}"
+- hosts: localhost
+  connection: local
+  gather_facts: no
+  tasks:
     - set_fact:
-        output_dict: {}
-    - set_fact:
-        output_dict: "{{ output_dict | combine(vars) }}"
-    - set_fact:
-        output_dict: "{{ output_dict | combine({'environment': environment}) }}"
-    - set_fact:
-        output_dict: "{{ output_dict | combine({'group_names': group_names}) }}"
-    - set_fact:
-        output_dict: "{{ output_dict | combine({'groups': groups}) }}"
-    - set_fact:
-        output_dict: "{{ output_dict | combine({'hostvars': hostvars}) }}"
+        output_dict: "{{ hostvars }}"
     - copy:
         content: "{{ output_dict | to_nice_json }}"
         dest: "{{ outputs_path | default('/tmp/outputs.json') }}"
@@ -317,7 +310,6 @@ def __init__(self, invoc):
         super().__init__(invoc)
         self._secret_handler = get_secret_handler(invoc, self._stack_instance,
                                                   "yaml")
-        # If any outputs are defined in the functional requirement set in base_handler
         if self._functional_requirement_obj.outputs:
             self._output = AnsibleOutput(self._functional_requirement_obj,
                                          self._invoc.stack_instance)
@@ -393,9 +385,8 @@ def __init__(self, invoc):
                 "playbook-role.yml": playbook_include_role
             }
         }]
-        if self._output:
-            self._volumes.append(self._output.volume_mount)
-            self._volumes.append(self._output.spec_mount)
+        # If any outputs are defined in the functional requirement set in base_handler
+
         self._init_containers = []
         self._command = ["/bin/sh", "-c"]
         self._command_args = [
@@ -417,19 +408,17 @@ def create_command_args(self) -> List[str]:
         if "ansible_playbook_path" in self.provisioning_parameters:
             self._command_args[
                 0] += f' && ansible-playbook {self.provisioning_parameters["ansible_playbook_path"]} -v -i /opt/ansible/playbooks/inventory/stackl.yml'
+        elif self._output:
+            pattern = self._service + "_" + str(self.index)
+            self._command_args[
+                0] += f' && ansible-playbook /opt/ansible/playbooks/stackl/playbook-role.yml -e ansible_role={self._functional_requirement} -i /opt/ansible/playbooks/inventory/stackl.yml -e pattern={pattern} '
+            self._command_args[
+                0] += f'-e outputs_path={self._output.output_file} '
         else:
             pattern = self._service + "_" + str(self.index)
             self._command_args[
                 0] += f' && ansible {pattern} -m include_role -v -i /opt/ansible/playbooks/inventory/stackl.yml -a name={self._functional_requirement}'
-            # self._command_args[
-            #     0] += f' && ansible-playbook /opt/ansible/playbooks/stackl/playbook-role.yml -v '
-            # self._command_args[
-            #     0] += f'-i /opt/ansible/playbooks/inventory/stackl.yml '
-            # self._command_args[
-            #     0] += f'-e ansible_role={self._functional_requirement} '
-            if self._output:
-                self._command_args[
-                    0] += f'-e outputs_path={self._output.output_file} '
+
         return self._command_args
 
     @property

stackl/agent/agent/kubernetes/outputs/ansible_output.py

@@ -11,3 +11,14 @@ def __init__(self, functional_requirement, stackl_instance_name):
             "type": "empty_dir",
             "mount_path": "/mnt/ansible/output/"
         })
+
+
+    @property
+    def stackl_cli_command_args(self):
+        return f'\
+            echo "Waiting for automation output to appear" &&\
+            while [[ ! -s "{self.output_file}" ]]; do sleep 2; done;\
+            cat {self.output_file} && \
+            convert_json_from_spec -f ansible --doc {self.output_file} --spec {self._spec_mount["mount_path"]}/spec.json --output {self.output_file} && \
+            stackl connect {self.stackl_host} && \
+            stackl update instance {self.stackl_instance_name} -p "$(cat {self.output_file})" -d'

stackl/agent/agent/kubernetes/outputs/output.py

@@ -10,10 +10,10 @@ def __init__(self, functional_requirement, stackl_instance_name: str):
         self.stack_instance = None
         self.output_file = ''
         self.stackl_host = f'http://{os.environ["STACKL_HOST"]}'
-        self.stackl_cli_image = 'stacklio/stackl-cli:v0.2.0'
+        self.stackl_cli_image = 'stacklio/stackl-cli:v0.2.1dev'
         self.stackl_cli_command = ['/bin/bash', '-c']
         self._functional_requirement = functional_requirement
-        self._env_list = None
+        self._env_list = {}
         self.stackl_instance_name = stackl_instance_name
         self._spec_mount = {
             "name": "outputs-spec",

stackl/cli/commands/connect.py

@@ -2,6 +2,7 @@
 from pathlib import Path
 
 import click
+from context import get_config_path
 
 
 @click.command()
@@ -12,11 +13,8 @@ def connect(host):
         homedir = os.getcwd()
     if not os.path.exists(homedir + os.sep + '.stackl'):
         os.makedirs(homedir + os.sep + '.stackl')
-    with open(config_path, 'w+') as stackl_config:
+    with open(get_config_path(), 'w+') as stackl_config:
         stackl_config.write(host)
 
 
-if len(str(Path.home())) == 0:
-    config_path = os.getcwd() + os.sep + '.stackl' + os.sep + 'config'
-else:
-    config_path = str(Path.home()) + os.sep + '.stackl' + os.sep + 'config'
+

stackl/cli/context.py

@@ -1,39 +1,45 @@
 import os
+from pathlib import Path
 
 import click
 import stackl_client
 
 
 class StacklContext(object):
     def __init__(self):
-        host = None
         try:
-            with open(config_path, 'r+') as stackl_config:
+            with open(get_config_path(), 'r+') as stackl_config:
                 host = stackl_config.read()
+                configuration = stackl_client.Configuration()
+                configuration.host = host
+                self.api_client = stackl_client.ApiClient(configuration=configuration)
+                self.infrastructure_base_api = stackl_client.InfrastructureBaseApi(
+                    api_client=self.api_client)
+                self.functional_requirements_api = stackl_client.FunctionalRequirementsApi(
+                    api_client=self.api_client)
+                self.services_api = stackl_client.ServicesApi(
+                    api_client=self.api_client)
+                self.sat_api = stackl_client.StackApplicationTemplatesApi(
+                    api_client=self.api_client)
+                self.sit_api = stackl_client.StackInfrastructureTemplatesApi(
+                    api_client=self.api_client)
+                self.stack_instances_api = stackl_client.StackInstancesApi(
+                    api_client=self.api_client)
+                self.policy_templates_api = stackl_client.PolicyTemplatesApi(
+                    api_client=self.api_client)
+                self.snapshot_api = stackl_client.SnapshotsApi(
+                    api_client=self.api_client)
         except FileNotFoundError:
-            click.echo("Config file not found, run `stackl connect` first")
-            exit(1)
-        configuration = stackl_client.Configuration()
-        configuration.host = host
-        self.api_client = stackl_client.ApiClient(configuration=configuration)
-        self.infrastructure_base_api = stackl_client.InfrastructureBaseApi(
-            api_client=self.api_client)
-        self.functional_requirements_api = stackl_client.FunctionalRequirementsApi(
-            api_client=self.api_client)
-        self.services_api = stackl_client.ServicesApi(
-            api_client=self.api_client)
-        self.sat_api = stackl_client.StackApplicationTemplatesApi(
-            api_client=self.api_client)
-        self.sit_api = stackl_client.StackInfrastructureTemplatesApi(
-            api_client=self.api_client)
-        self.stack_instances_api = stackl_client.StackInstancesApi(
-            api_client=self.api_client)
-        self.policy_templates_api = stackl_client.PolicyTemplatesApi(
-            api_client=self.api_client)
-        self.snapshot_api = stackl_client.SnapshotsApi(
-            api_client=self.api_client)
+            click.echo(
+                "Config file not found, run `stackl connect` first, ignore this if you are running stackl connect")
 
 
 pass_stackl_context = click.make_pass_decorator(StacklContext, ensure=True)
 
-config_path = os.path.expanduser('~') + os.sep + '.stackl' + os.sep + 'config'
+
+def get_config_path():
+    if len(str(Path.home())) == 0:
+        config_path = os.getcwd() + os.sep + '.stackl' + os.sep + 'config'
+    else:
+        config_path = str(Path.home()) + os.sep + '.stackl' + os.sep + 'config'
+    return config_path

stackl/cli/scripts/convert_json_from_spec.py

@@ -1,45 +1,58 @@
 #!/opt/venv/bin/python
-from abc import ABC, abstractmethod
-from glom import glom
-import json
 import argparse
+import json
 import sys
+from abc import ABC, abstractmethod
+from collections import defaultdict
+
+from glom import glom
 
 
 class Converter(ABC):
     @property
-    @abstractmethod
     def input_doc(self):
         pass
 
     @property
-    @abstractmethod
     def spec_doc(self):
         pass
 
     @property
-    @abstractmethod
     def output_path(self):
         pass
 
     @abstractmethod
     def convert(self):
         pass
 
+    def tree(self):
+        return defaultdict(self.tree)
+
 
 class JsonConverter(Converter):
-    @property
-    def spec_doc(self):
-        pass
+    def __init__(self,
+                 spec_doc_file: str = 'spec.json',
+                 json_doc_file: str = 'inputs.json',
+                 outputs_file: str = 'outputs.json'):
+        self.spec_doc_file = spec_doc_file
+        self.json_doc_file = json_doc_file
+        self.outputs_file = outputs_file
+        self.read_files()
 
-    @property
-    def output_path(self):
-        pass
+    def read_files(self):
+        with open(self.json_doc_file) as f:
+            self.json_doc = json.load(f)
+        with open(self.spec_doc_file) as f:
+            self.json_spec = json.load(f)
+
+    def convert(self):
+        result = {}
+        for field_name, field_spec in self.json_spec.items():
+            result[field_name] = glom(self.json_doc, field_spec)
+        return result
 
-    @property
-    def input_doc(self):
-        pass
 
+class AnsibleConverter(Converter):
     def __init__(self,
                  spec_doc_file: str = 'spec.json',
                  json_doc_file: str = 'inputs.json',
@@ -56,9 +69,10 @@ def read_files(self):
             self.json_spec = json.load(f)
 
     def convert(self):
-        result = {}
+        result = self.tree()
         for field_name, field_spec in self.json_spec.items():
-            result[field_name] = glom(self.json_doc, field_spec)
+            for host_ip, values in self.json_doc.items():
+                result[field_name][host_ip] = values[field_spec]
         return result
 
 
@@ -109,6 +123,10 @@ def main():
         converter = JsonConverter(json_doc_file=args.doc,
                                   spec_doc_file=args.spec,
                                   outputs_file=args.outputs_file)
+    elif doc_format == 'ansible':
+        converter = AnsibleConverter(json_doc_file=args.doc,
+                                     spec_doc_file=args.spec,
+                                     outputs_file=args.outputs_file)
     result = converter.convert()
     with open(args.outputs_file, 'w') as f:
         json.dump(result, f)

stackl/cli/setup.py

@@ -8,7 +8,7 @@
     py_modules=['stackl', 'commands', 'context'],
     packages=find_packages(),
     install_requires=[
-        'stackl-client==0.2.1dev', 'pyYAML==5.3', 'Click==7.0',
+        'stackl-client==0.2.0', 'pyYAML==5.3', 'Click==7.0',
         'mergedeep==1.3.0', 'tabulate==0.8.6', 'glom==19.10.0'
     ],
     entry_points='''