diff --git a/ansible/bootstrap.yml b/ansible/bootstrap.yml index 976a68b5acce35e857444c25022c3000c3cab6a2..9a1f7cea85be2fcee887e59ed697d522ef65a705 100644 --- a/ansible/bootstrap.yml +++ b/ansible/bootstrap.yml @@ -61,6 +61,9 @@ name: local-flux tags: ['flux'] when: local_flux + - import_role: + name: additional_config + tags: ['additional'] always: - import_role: name: finalize diff --git a/ansible/roles/additional_config/README.md b/ansible/roles/additional_config/README.md new file mode 100644 index 0000000000000000000000000000000000000000..abbef3b627044555998867b1d2ba2502fea23a51 --- /dev/null +++ b/ansible/roles/additional_config/README.md @@ -0,0 +1,4 @@ +This role configures the cluster after app installation has started via +flux. +All resources that are not needed for flux should go here, so we save time by +starting the flux install process early in the background. diff --git a/ansible/roles/configure/files/etc/logrotate.d/OpenAppStack b/ansible/roles/additional_config/files/etc/logrotate.d/OpenAppStack similarity index 100% rename from ansible/roles/configure/files/etc/logrotate.d/OpenAppStack rename to ansible/roles/additional_config/files/etc/logrotate.d/OpenAppStack diff --git a/ansible/roles/additional_config/tasks/logging.yml b/ansible/roles/additional_config/tasks/logging.yml new file mode 100644 index 0000000000000000000000000000000000000000..1be970769b00d9c938b1927be0b78e100f45c2f6 --- /dev/null +++ b/ansible/roles/additional_config/tasks/logging.yml @@ -0,0 +1,6 @@ +--- +- name: Logrotate config for OAS logs + copy: + src: etc/logrotate.d/OpenAppStack + dest: /etc/logrotate.d/ + mode: '0644' diff --git a/ansible/roles/additional_config/tasks/main.yml b/ansible/roles/additional_config/tasks/main.yml new file mode 100644 index 0000000000000000000000000000000000000000..c30f104e8305ab4a155233bb0e02bbc127cab886 --- /dev/null +++ b/ansible/roles/additional_config/tasks/main.yml @@ -0,0 +1,2 @@ +--- +- import_tasks: logging.yml diff --git a/ansible/roles/configure/tasks/main.yml b/ansible/roles/configure/tasks/main.yml index dd6a34f99d52cdd1070309ef2cfd174ad7268b44..fdffbb49562fffa05b849e34d14bc0f0c731f1b6 100644 --- a/ansible/roles/configure/tasks/main.yml +++ b/ansible/roles/configure/tasks/main.yml @@ -31,12 +31,6 @@ - python3-wheel - python3-psutil -- name: Logrotate config for OAS logs - copy: - src: etc/logrotate.d/OpenAppStack - dest: /etc/logrotate.d/ - mode: '0644' - - name: Install python packages via pip3 tags: - package