chore: refactor to using v.k.cluster_api (#469)
diff --git a/galaxy.yml b/galaxy.yml
index ac12f51..e14caf8 100644
--- a/galaxy.yml
+++ b/galaxy.yml
@@ -13,9 +13,9 @@
ansible.utils: 2.9.0
community.crypto: 2.2.3
community.general: 4.5.0
+ community.mysql: 3.6.0
kubernetes.core: 2.3.2
openstack.cloud: 1.7.0
- community.mysql: 3.6.0
vexxhost.ceph: 2.0.1
vexxhost.kubernetes: 1.6.0
tags:
diff --git a/roles/magnum/defaults/main.yml b/roles/magnum/defaults/main.yml
index fa95935..948019e 100644
--- a/roles/magnum/defaults/main.yml
+++ b/roles/magnum/defaults/main.yml
@@ -23,9 +23,7 @@
magnum_ingress_annotations: {}
magnum_registry_ingress_annotations: {}
-# URL for the clusterctl binary
-magnum_clusterctl_url: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.3/clusterctl-linux-amd64
-magnum_clusterctl_config_file: /etc/clusterctl.yaml
+# Cluster API configuration
magnum_clusterctl_config:
images:
cluster-api/cluster-api-controller:
diff --git a/roles/magnum/meta/main.yml b/roles/magnum/meta/main.yml
index 13a3528..998aca2 100644
--- a/roles/magnum/meta/main.yml
+++ b/roles/magnum/meta/main.yml
@@ -31,3 +31,6 @@
vars:
upload_helm_chart_src: "{{ magnum_helm_chart_path }}"
upload_helm_chart_dest: "{{ magnum_helm_chart_ref }}"
+ - role: vexxhost.kubernetes.cluster_api
+ vars:
+ clusterctl_config: "{{ magnum_clusterctl_config }}"
diff --git a/roles/magnum/tasks/main.yml b/roles/magnum/tasks/main.yml
index 9033e92..8abc93a 100644
--- a/roles/magnum/tasks/main.yml
+++ b/roles/magnum/tasks/main.yml
@@ -39,37 +39,6 @@
name: "{{ magnum_helm_release_name }}"
namespace: "{{ magnum_helm_release_namespace }}"
-- name: Install "clusterctl"
- ansible.builtin.get_url:
- url: "{{ magnum_clusterctl_url }}"
- dest: /usr/local/bin/clusterctl
- mode: "0755"
- owner: root
- group: root
-
-- name: Create a configuration file
- ansible.builtin.copy:
- content: "{{ magnum_clusterctl_config | to_nice_yaml }}"
- dest: "{{ magnum_clusterctl_config_file }}"
- mode: "0644"
- owner: root
- group: root
-
-- name: Initialize the management cluster
- run_once: true
- changed_when: false
- ansible.builtin.command: |
- clusterctl init \
- --config {{ magnum_clusterctl_config_file }} \
- --core cluster-api:v1.3.3 \
- --bootstrap kubeadm:v1.3.3 \
- --control-plane kubeadm:v1.3.3 \
- --infrastructure openstack:v0.7.1
- environment:
- CLUSTER_TOPOLOGY: "true"
- EXP_CLUSTER_RESOURCE_SET: "true"
-
-
# NOTE(okozachenko1203): We should get rid of this task eventually as it is removing
# the old RBAC resources.
- name: Remove the legacy mcapi RBAC resources