From 62cfbb00441425645dca001b04212d512a55ec13 Mon Sep 17 00:00:00 2001
From: Varac <varac@varac.net>
Date: Tue, 21 Jan 2020 16:07:06 +0100
Subject: [PATCH] Add new role additional_config
---
ansible/bootstrap.yml | 3 +++
ansible/roles/additional_config/README.md | 4 ++++
.../files/etc/logrotate.d/OpenAppStack | 0
ansible/roles/additional_config/tasks/logging.yml | 6 ++++++
ansible/roles/additional_config/tasks/main.yml | 2 ++
ansible/roles/configure/tasks/main.yml | 6 ------
6 files changed, 15 insertions(+), 6 deletions(-)
create mode 100644 ansible/roles/additional_config/README.md
rename ansible/roles/{configure => additional_config}/files/etc/logrotate.d/OpenAppStack (100%)
create mode 100644 ansible/roles/additional_config/tasks/logging.yml
create mode 100644 ansible/roles/additional_config/tasks/main.yml
diff --git a/ansible/bootstrap.yml b/ansible/bootstrap.yml
index 976a68b5a..9a1f7cea8 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 000000000..abbef3b62
--- /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 000000000..1be970769
--- /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 000000000..c30f104e8
--- /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 dd6a34f99..fdffbb495 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
--
GitLab