From be1ba2be3184fa7d95037ab59d5f95387b6c56c0 Mon Sep 17 00:00:00 2001
From: Elias Wimmer <elias.wimmer@tuwien.ac.at>
Date: Sat, 21 Aug 2021 22:08:01 +0200
Subject: [PATCH] fix ceph
---
roles/create_infrastructure/tasks/keypair.yml | 3 ++-
roles/create_infrastructure/templates/all.yml.j2 | 4 +++-
roles/rke2/templates/helm/deploy-cephfs.j2 | 10 ++++------
3 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/roles/create_infrastructure/tasks/keypair.yml b/roles/create_infrastructure/tasks/keypair.yml
index 4e1f3b2..5163a14 100644
--- a/roles/create_infrastructure/tasks/keypair.yml
+++ b/roles/create_infrastructure/tasks/keypair.yml
@@ -11,6 +11,7 @@
- name: store private key locally
copy:
- dest: "{{ ssh_key_name }}.pem"
+ dest: "{{ inventory_dir }}/{{ ssh_key_name }}.pem"
content: "{{ ssh_key.key.private_key }}"
+ mode: "0600"
when: state == 'present' and ssh_key.key.private_key != none
\ No newline at end of file
diff --git a/roles/create_infrastructure/templates/all.yml.j2 b/roles/create_infrastructure/templates/all.yml.j2
index f64dd20..ce804d5 100644
--- a/roles/create_infrastructure/templates/all.yml.j2
+++ b/roles/create_infrastructure/templates/all.yml.j2
@@ -2,4 +2,6 @@ loadbalancer_ip: {{ new_loadbalancer_ip }}
master_floating_ip: {{ new_master_floating_ip }}
-subnet_id: {{ new_subnet_id }}
\ No newline at end of file
+subnet_id: {{ new_subnet_id }}
+
+ssh_key_file: {{ ssh_key_file }}
\ No newline at end of file
diff --git a/roles/rke2/templates/helm/deploy-cephfs.j2 b/roles/rke2/templates/helm/deploy-cephfs.j2
index e60eaa7..f3a40af 100644
--- a/roles/rke2/templates/helm/deploy-cephfs.j2
+++ b/roles/rke2/templates/helm/deploy-cephfs.j2
@@ -9,10 +9,8 @@ spec:
version: 3.3.1
valuesContent: |-
csiConfig:
- - clusterID: "356ebb9a-acc2-11ea-a9d6-b8599fef7b50"
+ - clusterID: "{{ ceph_cluster_id }}"
monitors:
- - "10.0.2.1:6789"
- - "10.0.2.2:6789"
- - "10.0.2.3:6789"
- - "10.0.2.4:6789"
- - "10.0.2.5:6789"
\ No newline at end of file
+{% for mon in ceph_monitors %}
+ - {{ mon }}
+{% endfor %}
\ No newline at end of file
--
GitLab