diff --git a/roles/install_common/tasks/agent_install.yml b/roles/install_common/tasks/agent_install.yml index 4537e4c..9825a05 100644 --- a/roles/install_common/tasks/agent_install.yml +++ b/roles/install_common/tasks/agent_install.yml @@ -20,6 +20,7 @@ {{ '-s ' ~ service_images_copy.dest if service_images_file }} {{ '-w ' ~ workspace_images_copy.dest if workspace_images_file }} {{ '-x ' ~ network_plugin_copy.dest if network_plugin_file }} + {{ '--offline-logger-plugin ' ~ logging_plugin_copy.dest if logging_plugin_file }} register: install_output become: true retries: 20 diff --git a/roles/install_common/tasks/copy_installer.yml b/roles/install_common/tasks/copy_installer.yml index 594454a..9a8704a 100644 --- a/roles/install_common/tasks/copy_installer.yml +++ b/roles/install_common/tasks/copy_installer.yml @@ -3,15 +3,17 @@ installer_glob: "{{ lookup('fileglob', '{{role_path}}/files/kasm_workspaces_*.tar.gz', wantlist=True) + lookup('fileglob', '{{role_path}}/files/kasm_release_*.tar.gz', wantlist=True) }}" service_images_glob: "{{ lookup('fileglob', '{{role_path}}/files/kasm_workspaces_service_images*.tar.gz', wantlist=True) + lookup('fileglob', '{{role_path}}/files/kasm_release_service_images*.tar.gz', wantlist=True) }}" workspace_images_glob: "{{ lookup('fileglob', '{{role_path}}/files/kasm_workspaces_workspace_images_*.tar.gz', wantlist=True) + lookup('fileglob', '{{role_path}}/files/kasm_release_workspace_images_*.tar.gz', wantlist=True) }}" - network_plugin_glob: "{{ lookup('fileglob', '{{role_path}}//files/kasmweb_network_plugin_*.tar.gz', wantlist=True)}}" + network_plugin_glob: "{{ lookup('fileglob', '{{role_path}}//files/kasmweb_network_plugin_*.tar.gz', wantlist=True) + lookup('fileglob', '{{role_path}}//files/kasm_release_network_plugin_images_*.tar.gz', wantlist=True)}}" + logging_plugin_glob: "{{ lookup('fileglob', '{{role_path}}//files/kasmweb_logging_plugin_*.tar.gz', wantlist=True) + lookup('fileglob', '{{role_path}}//files/kasm_release_logging_plugin_images_*.tar.gz', wantlist=True)}}" delegate_to: localhost - set_fact: # Our installer glob search will also include service_images and workspace_images so we filter them out with difference() - installer_file: "{{ installer_glob | difference(service_images_glob) | difference(workspace_images_glob) | first | default(None) }}" + installer_file: "{{ installer_glob | difference(service_images_glob) | difference(workspace_images_glob) | difference(network_plugin_glob) | difference(logging_plugin_glob) | first | default(None) }}" service_images_file: "{{ service_images_glob | first | default(None) }}" workspace_images_file: "{{ workspace_images_glob | first | default(None) }}" network_plugin_file: "{{ network_plugin_glob | first | default(None) }}" + logging_plugin_file: "{{ logging_plugin_glob | first | default(None) }}" - name: Assert that Kasm installer exists assert: @@ -46,3 +48,10 @@ dest: "{{ tempdir.path }}" register: network_plugin_copy when: network_plugin_file + +- name: Copy Logging Plugin + copy: + src: "{{ logging_plugin_file }}" + dest: "{{ tempdir.path }}" + register: logging_plugin_copy + when: logging_plugin_file diff --git a/roles/install_common/tasks/remote_db_init.yml b/roles/install_common/tasks/remote_db_init.yml index 29c68e7..e69c0f8 100644 --- a/roles/install_common/tasks/remote_db_init.yml +++ b/roles/install_common/tasks/remote_db_init.yml @@ -26,6 +26,7 @@ --admin-password {{ admin_password }} {{ '--no-db-ssl ' if not database_ssl }} {{ '--offline-service ' ~ service_images_copy.dest if service_images_file }} + {{ '--offline-workspaces ' ~ workspace_images_copy.dest if workspace_images_file }} responses: Continue(?i): "y" run_once: true