add cni toggle

README.md

@@ -27,18 +27,20 @@ Use roles inside a Ansible playbook
 
 ## Variables
 
-| Variable           | Default                              | Description                                                    |
-| ------------------ | ------------------------------------ | -------------------------------------------------------------- |
-| cluster_name       |                                      | Name of the RKE2 cluster                                       |
-| server_count       | 3                                    | Number of RKE2 worker VMs                                      |
-| agent_count        | 3                                    | Number of RKE2 server VMs                                      |
-| server_flavor      | m1a.large                            | Server VM flavor                                               |
-| agent_flavor       | m1a.xlarge                           | Worker VM flavor                                               |
-| server_volume_size | 50                                   | Volume size (GB) for server VM                                 |
-| agent_volume_size  | 100                                  | Volume size (GB) for worker VM                                 |
-| image              | 1fe615f0-9dad-447d-bf54-9071defafb77 | ID for OpenStack VM image                                      |
-| domain             |                                      | DNS-Entry for loadbalancer IP                                  |
-| node_taints        |                                      | Node taints for RKE2 node                                      |
-| node_labels        |                                      | Node labels for RKE2 node                                      |
-| rke2_channel       | stable                               | RKE3 version channel                                           |
-| state              | present                              | Flag for setup (`present`) or removing (`absent`) RKE3 cluster |
+| Variable           | Default                              | Description                                                                                 |
+| ------------------ | ------------------------------------ | ------------------------------------------------------------------------------------------- |
+| cluster_name       |                                      | Name of the RKE2 cluster                                                                    |
+| server_count       | 3                                    | Number of RKE2 worker VMs                                                                   |
+| agent_count        | 3                                    | Number of RKE2 server VMs                                                                   |
+| server_flavor      | m1a.large                            | Server VM flavor                                                                            |
+| agent_flavor       | m1a.xlarge                           | Worker VM flavor                                                                            |
+| server_volume_size | 50                                   | Volume size (GB) for server VM                                                              |
+| agent_volume_size  | 100                                  | Volume size (GB) for worker VM                                                              |
+| image              | 1fe615f0-9dad-447d-bf54-9071defafb77 | ID for OpenStack VM image                                                                   |
+| domain             |                                      | DNS-Entry for loadbalancer IP                                                               |
+| node_taints        |                                      | Node taints for RKE2 node                                                                   |
+| node_labels        |                                      | Node labels for RKE2 node                                                                   |
+| rke2_channel       | stable                               | RKE3 version channel                                                                        |
+| state              | present                              | Flag for setup (`present`) or removing (`absent`) RKE3 cluster                              |
+| registry_mirrors   | {}                                   | [rke2-docs](https://docs.rke2.io/install/containerd_registry_configuration/#mirrors)        |
+| manifests          | {}                                   | [defualts](collections/ansible_collections/adls/osrancher/roles/rke2/defaults/main.yml#L58) |

roles/rke2/defaults/main.yml

+state: present
+upgrade: no
+dist_upgrade: no
+reboot: no
+
 domain:
 server: "https://{{ domain }}:9345"
 
@@ -38,13 +43,8 @@ registry_mirrors: {}
 #     auth: --SEE_ABOVE--
 #     tls: --SEE_ABOVE--
 
-
-state: present
-upgrade: no
-dist_upgrade: no
-reboot: no
-
 manifests: {} # used to override default_manifests
+manifests_config: "{{ default_manifests | combine(manifests) }}"
 default_manifests:
   config-rke2-coredns:
     enabled: false

roles/rke2/templates/config.yaml.j2

@@ -40,8 +40,21 @@ resolv-conf: "{{ resolv_conf_server }}"
 write-kubeconfig-mode: "0644"
 kube-apiserver-arg: "--enable-admission-plugins=NodeRestriction,PodSecurityPolicy,PodNodeSelector,PodTolerationRestriction,DenyServiceExternalIPs"
 
+
+{% if cni is defined and cni | length > 0 %}
+cni: "{{ cni }}"
+{% elif manifests_config.calico.enabled and manifests_config.cilium.enabled%}
+cni: multus,calico,cilium
+{% elif manifests_config.calico.enabled%}
+cni: calico
+{% elif manifests_config.cilium.enabled%}
+cni: cilium
+{% endif %}
+
 {% if cni is defined and cni | length > 0 %}
 cni: "{{ cni }}"
+{% elseif (default_manifests | combine(manifests)). %}
+
 {% endif %}
 
 {% if tls_san is defined and tls_san | length > 0 %}