From 2af5dfa442deded03a075a69b9b0df2c9166ecbb Mon Sep 17 00:00:00 2001
From: Maarten de Waard <maarten@greenhost.nl>
Date: Wed, 27 May 2020 14:07:29 +0200
Subject: [PATCH] fix ansible playbook
---
.../configuration_README.md => files/README.md} | 2 +-
ansible/roles/configure/tasks/main.yml | 11 ++++++-----
ansible/roles/pre-configure/tasks/main.yml | 4 ----
3 files changed, 7 insertions(+), 10 deletions(-)
rename ansible/roles/configure/{templates/configuration_README.md => files/README.md} (89%)
diff --git a/ansible/roles/configure/templates/configuration_README.md b/ansible/roles/configure/files/README.md
similarity index 89%
rename from ansible/roles/configure/templates/configuration_README.md
rename to ansible/roles/configure/files/README.md
index cf5a29381..7ca34cbbf 100644
--- a/ansible/roles/configure/templates/configuration_README.md
+++ b/ansible/roles/configure/files/README.md
@@ -1,4 +1,4 @@
-This directory contains configuration for the OpenAppStack instance running on
+This directory contains information about the OpenAppStack instance running on
this machine. For general information, see [https://openappstack.net].
## Flux
diff --git a/ansible/roles/configure/tasks/main.yml b/ansible/roles/configure/tasks/main.yml
index 07eea015f..2570f1760 100644
--- a/ansible/roles/configure/tasks/main.yml
+++ b/ansible/roles/configure/tasks/main.yml
@@ -7,13 +7,14 @@
state: directory
become: true
with_items:
- - "{{ configuration_directory }}"
+ - "{{ data_directory }}"
- "/usr/local/share/bash-completion/completions"
- name: Create README in configuration directory
- template:
- src: configuration_README.md
- dest: "{{ configuration_directory }}/README.md"
+ copy:
+ dest: "{{ data_directory }}/README.md"
+ src: README.md
+ mode: '0755'
become: true
- name: Install bash-completion
@@ -77,7 +78,7 @@
- version
template:
src: "version.txt"
- dest: "/var/lib/OpenAppStack/version.txt"
+ dest: "{{ data_directory }}/version.txt"
mode: "0444"
become: true
diff --git a/ansible/roles/pre-configure/tasks/main.yml b/ansible/roles/pre-configure/tasks/main.yml
index 4d5036284..787d720f1 100644
--- a/ansible/roles/pre-configure/tasks/main.yml
+++ b/ansible/roles/pre-configure/tasks/main.yml
@@ -59,10 +59,6 @@
- openshift
executable: /usr/bin/pip3
-- name: Set configuration directory
- set_fact:
- configuration_directory: "{{ configuration_directory }}"
-
- name: Install kubectl snap
# kubectl needs to get installed as "classic" snap
command: snap install --classic kubectl
--
GitLab