diff --git a/acm_import/Makefile b/acm_import/Makefile index f6bf9d4..8343249 100644 --- a/acm_import/Makefile +++ b/acm_import/Makefile @@ -7,4 +7,4 @@ help: .PHONY: import import: ## Imports SPOKECONFIG into HUBCONFIG defined clusters - ansible-playbook -e clustergroup=$(CLUSTERGROUP) post.yml + ansible-playbook -e clustergroup_label=$(CLUSTERGROUP) post.yml diff --git a/acm_import/roles/acm_import/defaults/main.yml b/acm_import/roles/acm_import/defaults/main.yml index 029dfa6..a2968c8 100644 --- a/acm_import/roles/acm_import/defaults/main.yml +++ b/acm_import/roles/acm_import/defaults/main.yml @@ -1,4 +1,4 @@ -clustergroup: group-one +clustergroup_label: group-one ocm_iam_policy_controller: true ocm_search_controller: true ocm_policy_controller: true diff --git a/acm_import/roles/acm_import/templates/klusterletaddonconfig.yml.j2 b/acm_import/roles/acm_import/templates/klusterletaddonconfig.yml.j2 index 88e0b56..e8a0ff7 100644 --- a/acm_import/roles/acm_import/templates/klusterletaddonconfig.yml.j2 +++ b/acm_import/roles/acm_import/templates/klusterletaddonconfig.yml.j2 @@ -11,7 +11,7 @@ spec: cloud: auto-detect name: {{ region_cluster_name }} vendor: auto-detect - clusterGroup: {{ clustergroup }} + clusterGroup: {{ clustergroup_label }} iamPolicyController: enabled: {{ ocm_iam_policy_controller }} searchCollector: diff --git a/acm_import/roles/acm_import/templates/managedcluster.yml.j2 b/acm_import/roles/acm_import/templates/managedcluster.yml.j2 index a906784..7e6adf7 100644 --- a/acm_import/roles/acm_import/templates/managedcluster.yml.j2 +++ b/acm_import/roles/acm_import/templates/managedcluster.yml.j2 @@ -7,7 +7,7 @@ metadata: name: {{ region_cluster_name }} vendor: auto-detect cloud: auto-detect - clusterGroup: {{ clustergroup }} + clusterGroup: {{ clustergroup_label }} spec: hubAcceptsClient: true leaseDurationSeconds: 60