diff --git a/roles/install_common/tasks/agent_install.yml b/roles/install_common/tasks/agent_install.yml index 7923d0e..4989d11 100644 --- a/roles/install_common/tasks/agent_install.yml +++ b/roles/install_common/tasks/agent_install.yml @@ -1,6 +1,6 @@ - name: Check connection from agent to webserver uri: - url: "https://{{ web_ip }}/api/__healthcheck" + url: "https://{{ web_ip }}:{{ proxy_port }}/api/__healthcheck" timeout: 5 validate_certs: false register: _result @@ -9,7 +9,7 @@ delay: 5 - name: Install agent role - command: "bash {{ tempdir.path }}/kasm_release/install.sh -S agent -e -p {{ target_ip }} -m {{ web_ip }} -M {{ manager_token }} {{ '-s ' ~ service_images_copy.dest if service_images_file }} {{ '-w ' ~ workspace_images_copy.dest if workspace_images_file }}" + command: "bash {{ tempdir.path }}/kasm_release/install.sh -S agent -e -L {{ proxy_port }} -p {{ target_ip }} -m {{ web_ip }} -M {{ manager_token }} {{ '-s ' ~ service_images_copy.dest if service_images_file }} {{ '-w ' ~ workspace_images_copy.dest if workspace_images_file }}" register: install_output become: true retries: 20 @@ -18,7 +18,7 @@ when: test is not defined - name: Install agent role - test - command: "bash {{ tempdir.path }}/kasm_release/install.sh -S agent -I -e -p {{ target_ip }} -m {{ web_ip }} -M {{ manager_token }} {{ '-s ' ~ service_images_copy.dest if service_images_file }} {{ '-w ' ~ workspace_images_copy.dest if workspace_images_file }}" + command: "bash {{ tempdir.path }}/kasm_release/install.sh -S agent -I -e -L {{ proxy_port }} -p {{ target_ip }} -m {{ web_ip }} -M {{ manager_token }} {{ '-s ' ~ service_images_copy.dest if service_images_file }} {{ '-w ' ~ workspace_images_copy.dest if workspace_images_file }}" register: install_output become: true retries: 20 diff --git a/roles/install_common/tasks/db_install.yml b/roles/install_common/tasks/db_install.yml index 6a7d894..1b83609 100644 --- a/roles/install_common/tasks/db_install.yml +++ b/roles/install_common/tasks/db_install.yml @@ -1,5 +1,5 @@ - name: Install database role - command: "bash {{ tempdir.path }}/kasm_release/install.sh -S db -e -Q {{database_password}} -R {{redis_password}} -U {{user_password}} -P {{admin_password}} -M {{manager_token}} --registration-token {{registration_token}} {{ '-s ' ~ service_images_copy.dest if service_images_file }} {{ '-w ' ~ workspace_images_copy.dest if workspace_images_file }}" + command: "bash {{ tempdir.path }}/kasm_release/install.sh -S db -e -L {{proxy_port}} -Q {{database_password}} -R {{redis_password}} -U {{user_password}} -P {{admin_password}} -M {{manager_token}} --registration-token {{registration_token}} {{ '-s ' ~ service_images_copy.dest if service_images_file }} {{ '-w ' ~ workspace_images_copy.dest if workspace_images_file }}" register: install_output become: true retries: 20 @@ -8,7 +8,7 @@ when: test is not defined - name: Install database role - test - command: "bash {{ tempdir.path }}/kasm_release/install.sh -S db -e -I -Q {{database_password}} -R {{redis_password}} -U {{user_password}} -P {{admin_password}} -M {{manager_token}} --registration-token {{registration_token}} {{ '-s ' ~ service_images_copy.dest if service_images_file }} {{ '-w ' ~ workspace_images_copy.dest if workspace_images_file }}" + command: "bash {{ tempdir.path }}/kasm_release/install.sh -S db -e -L {{proxy_port}} -I -Q {{database_password}} -R {{redis_password}} -U {{user_password}} -P {{admin_password}} -M {{manager_token}} --registration-token {{registration_token}} {{ '-s ' ~ service_images_copy.dest if service_images_file }} {{ '-w ' ~ workspace_images_copy.dest if workspace_images_file }}" register: install_output become: true retries: 20 diff --git a/roles/install_common/tasks/guac_install.yml b/roles/install_common/tasks/guac_install.yml index 241c4f1..492b4c5 100644 --- a/roles/install_common/tasks/guac_install.yml +++ b/roles/install_common/tasks/guac_install.yml @@ -1,6 +1,6 @@ - name: Check connection from guac to webserver uri: - url: "https://{{ web_ip }}/api/__healthcheck" + url: "https://{{ web_ip }}:{{ proxy_port }}/api/__healthcheck" timeout: 5 validate_certs: false register: _result @@ -9,7 +9,7 @@ delay: 5 - name: Install guac role - command: "bash {{ tempdir.path }}/kasm_release/install.sh -S guac -e --api-hostname {{ web_ip }} --public-hostname {{ guac_ip }} --registration-token {{ registration_token }} {{ '-s ' ~ service_images_copy.dest if service_images_file }}" + command: "bash {{ tempdir.path }}/kasm_release/install.sh -S guac -e -L {{ proxy_port }} --api-hostname {{ web_ip }} --public-hostname {{ guac_ip }} --registration-token {{ registration_token }} {{ '-s ' ~ service_images_copy.dest if service_images_file }}" register: install_output become: true retries: 20 diff --git a/roles/install_common/tasks/web_install.yml b/roles/install_common/tasks/web_install.yml index 0d09f37..3830ffe 100644 --- a/roles/install_common/tasks/web_install.yml +++ b/roles/install_common/tasks/web_install.yml @@ -11,7 +11,7 @@ timeout: 60 - name: Install web role - command: "bash {{ tempdir.path }}/kasm_release/install.sh -S app -e -q {{ db_ip }} -Q {{ database_password }} -R {{ redis_password }} -n {{ target_ip }} {{ '-s ' ~ service_images_copy.dest if service_images_file }} {{ '-w ' ~ workspace_images_copy.dest if workspace_images_file }}" + command: "bash {{ tempdir.path }}/kasm_release/install.sh -S app -e -L {{ proxy_port }} -q {{ db_ip }} -Q {{ database_password }} -R {{ redis_password }} -n {{ target_ip }} {{ '-s ' ~ service_images_copy.dest if service_images_file }} {{ '-w ' ~ workspace_images_copy.dest if workspace_images_file }}" register: install_output become: true retries: 20 diff --git a/roles/install_common/vars/main.yml b/roles/install_common/vars/main.yml index cf83a8f..c132a26 100644 --- a/roles/install_common/vars/main.yml +++ b/roles/install_common/vars/main.yml @@ -16,5 +16,8 @@ # Token that agents use to connect to webapp #manager_token: changeme +# Port to listen on +proxy_port: 443 + # Start docker daemon at boot start_docker_on_boot: true