diff --git a/roles/rke2/defaults/main.yml b/roles/rke2/defaults/main.yml index 9d199002795f9988c22c2add79112d3aa86670d6..80a359ea776c55abf265f3f66240bc954ee1b02c 100644 --- a/roles/rke2/defaults/main.yml +++ b/roles/rke2/defaults/main.yml @@ -7,10 +7,6 @@ tls_san: node_taints: [] node_labels: [] -grafana_password: -rancher_ui_dns: -letsEncrypt_admin_mail: - rke2_channel: stable state: present \ No newline at end of file diff --git a/roles/rke2/handlers/main.yml b/roles/rke2/handlers/main.yml index b5a2ba62aa46a0d50acc9e5c426fa6225d1a94d6..0ab4ca978d6d8e04a48282e44b5f05e187b4381f 100644 --- a/roles/rke2/handlers/main.yml +++ b/roles/rke2/handlers/main.yml @@ -1,7 +1,6 @@ - name: restart rke2 service: name: "rke2-{{ node_type }}" - enabled: yes masked: no state: restarted daemon_reload: yes \ No newline at end of file diff --git a/roles/rke2/templates/config.yaml.j2 b/roles/rke2/templates/config.yaml.j2 index 2ab69109e52171d05ce9a86edfc59b04ce26fbca..415ebf01fd46bb30c09b13a20432abc82a98af99 100644 --- a/roles/rke2/templates/config.yaml.j2 +++ b/roles/rke2/templates/config.yaml.j2 @@ -6,7 +6,9 @@ token: "{{ token }}" server: "{{ server }}" {% endif %} -profile: "cis-1.5" +{% if cis_profile is defined %} +profile: "{{ cis_profile }}" +{% endif %} resolv-conf: "/run/systemd/resolve/resolv.conf" # systemd-resolved debug: true cloud-provider-name: "external" diff --git a/roles/rke2/templates/helm/deploy-cephfs.j2 b/roles/rke2/templates/helm/deploy-cephfs.j2 index fe7d1a80230e040aeed3f65988f4928cd02899bb..e60eaa751ce11ce8ad6caedf9c091357675ed36a 100644 --- a/roles/rke2/templates/helm/deploy-cephfs.j2 +++ b/roles/rke2/templates/helm/deploy-cephfs.j2 @@ -7,4 +7,12 @@ spec: repo: https://ceph.github.io/csi-charts chart: ceph-csi-cephfs version: 3.3.1 -# valuesContent: |- + valuesContent: |- + csiConfig: + - clusterID: "356ebb9a-acc2-11ea-a9d6-b8599fef7b50" + 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