diff options
Diffstat (limited to 'ansible')
| -rw-r--r-- | ansible/roles/application-install/tasks/install.yml | 2 | ||||
| -rw-r--r-- | ansible/roles/resource-data/tasks/nfs-upload.yml | 1 | ||||
| -rw-r--r-- | ansible/roles/resource-data/tasks/ssh-upload.yml | 1 | ||||
| -rw-r--r-- | ansible/site.yml | 12 |
4 files changed, 13 insertions, 3 deletions
diff --git a/ansible/roles/application-install/tasks/install.yml b/ansible/roles/application-install/tasks/install.yml index 5246bf2f..c0be12eb 100644 --- a/ansible/roles/application-install/tasks/install.yml +++ b/ansible/roles/application-install/tasks/install.yml @@ -50,7 +50,7 @@ dest: "{{ app_data_path}}/override.yaml" content: | global: - cacert: + cacert: | {{ root_cert['content'] | b64decode | indent( width=4, indentfirst=False) }} - name: Check for deploy plugin presence diff --git a/ansible/roles/resource-data/tasks/nfs-upload.yml b/ansible/roles/resource-data/tasks/nfs-upload.yml index 825486b6..4b5c18d1 100644 --- a/ansible/roles/resource-data/tasks/nfs-upload.yml +++ b/ansible/roles/resource-data/tasks/nfs-upload.yml @@ -22,6 +22,7 @@ dest: "{{ aux_data_path }}" when: > hostvars[groups.resources.0].aux_resources_filename is defined + and hostvars[groups.resources.0].aux_resources_filename is not none and aux_data_path is defined and aux_data_path is not none and hostvars[groups.resources.0].aux_file_presence.stat.exists and not aux_resources_data_check.stat.exists diff --git a/ansible/roles/resource-data/tasks/ssh-upload.yml b/ansible/roles/resource-data/tasks/ssh-upload.yml index 8e04d5c0..bc7df37f 100644 --- a/ansible/roles/resource-data/tasks/ssh-upload.yml +++ b/ansible/roles/resource-data/tasks/ssh-upload.yml @@ -29,6 +29,7 @@ | tar -C "{{ aux_data_path }}" -xf - when: > hostvars[groups.resources.0].aux_resources_filename is defined + and hostvars[groups.resources.0].aux_resources_filename is not none and aux_data_path is defined and aux_data_path is not none and hostvars[groups.resources.0].aux_file_presence.stat.exists and not aux_resources_data_check.stat.exists diff --git a/ansible/site.yml b/ansible/site.yml index db1281e1..0df534d0 100644 --- a/ansible/site.yml +++ b/ansible/site.yml @@ -1,10 +1,18 @@ --- # # Master playbook to run offline installer. -# Run this playbook e.g. with command: ./run_playbook.sh -e @application/application_configuration.yml +# Run this playbook e.g. with command: ./run_playbook.sh -e @application/application_configuration.yml site.yml # -- import_playbook: setup.yml +# the setup.yml playbook is excluded from this list for the following reasons: +# 1. setup.yml playbook requires either already deployed ssh key or +# --ask-pass argument to interactively distribute a new key, which may +# be a redundant effort if you already secured passwordless login +# 2. Also, the setup.yml playbook is not mandatory and can be replaced with +# manual or semi-manual steps with ssh-copy-id command or other +# 3. playbooks here are more or less batch jobs and the ssh authentication +# is a precondition, which should be done during configuration of the +# installer - import_playbook: upload_resources.yml - import_playbook: infrastructure.yml - import_playbook: rancher_kubernetes.yml |