Merge pull request #732 from deNBI/staging

Staging

.env.in

@@ -12,7 +12,7 @@ OS_PROJECT_DOMAIN_ID=
 OS_PASSWORD=
 
 # Filebeat
-FILEBEAT_TAG=7.12.1
+FILEBEAT_TAG=7.13.0
 ELASTIC_USER=
 ELASTIC_PASSWORD=
 HOST=portal-dev.denbi.de

VirtualMachineService/VirtualMachineHandler.py

@@ -174,7 +174,7 @@ def __init__(self, config):
             # connection to redis. Uses a pool with 10 connections.
             self.REDIS_HOST = cfg["redis"]["host"]
             self.REDIS_PORT = cfg["redis"]["port"]
-            self.REDIS_PASSWORD = cfg["redis"]["password"]
+            self.REDIS_PASSWORD = cfg["redis"].get("password", None)
             LOG.info(f"Connecting to Redis at {self.REDIS_HOST}:{self.REDIS_PORT}..")
             self.pool = redis.ConnectionPool(
                 host=self.REDIS_HOST, port=self.REDIS_PORT, password=self.REDIS_PASSWORD

VirtualMachineService/VirtualMachineServer.py

@@ -60,9 +60,10 @@ def catch_shutdown(signal, frame):
         cfg = yaml.load(ymlfile, Loader=yaml.SafeLoader)
         HOST = cfg["openstack_connection"]["host"]
         PORT = cfg["openstack_connection"]["port"]
-        CERTFILE = cfg["openstack_connection"]["certfile"]
-        THREADS = cfg["openstack_connection"]["threads"]
         USE_SSL = cfg["openstack_connection"].get("use_ssl", True)
+        if USE_SSL:
+            CERTFILE = cfg["openstack_connection"]["certfile"]
+        THREADS = cfg["openstack_connection"]["threads"]
     click.echo("Server is running on port {}".format(PORT))
     handler = VirtualMachineHandler(CONFIG_FILE)
     processor = Processor(handler)

VirtualMachineService/ancon/Playbook.py

@@ -228,10 +228,8 @@ def add_always_tasks_only(self, playbook_name):
         )
 
     def run_it(self):
-        command_string = (
-            "/usr/local/bin/ansible-playbook -t 30 -vvvv -i {0} {1}/{2}".format(
-                self.inventory.name, self.directory.name, self.playbook_exec_name
-            )
+        command_string = "/usr/local/bin/ansible-playbook -v -i {0} {1}/{2}".format(
+            self.inventory.name, self.directory.name, self.playbook_exec_name
         )
         LOG.info(f"Run Playbook with command {command_string}")
         command_string = shlex.split(command_string)

ansible.cfg

@@ -1,10 +1,8 @@
 [defaults]
 host_key_checking = False
-record_host_key = False
 roles_path = ~/.ansible/roles:/usr/share/ansible/roles:/etc/ansible/roles:/code/VirtualMachineService/ancon/playbooks/roles
 
 [paramiko_connection]
 host_key_checking = False
-record_host_key = False
 env:ANSIBLE_PARAMIKO_HOST_KEY_CHECKING
 var: ansible_paramiko_host_key_checking