diff --git a/ansible/roles/telco-core-ztp/tasks/main.yml b/ansible/roles/telco-core-ztp/tasks/main.yml index b21e2c9..bce28fe 100644 --- a/ansible/roles/telco-core-ztp/tasks/main.yml +++ b/ansible/roles/telco-core-ztp/tasks/main.yml @@ -12,6 +12,7 @@ - "{{ install_directory }}/rhacm-ztp/cnf-features-deploy/ztp/gitops-subscriptions/argocd/policy-applications/" - "{{ install_directory }}/rhacm-ztp/cnf-features-deploy/ztp/gitops-subscriptions/argocd/policy/" - "{{ install_directory }}/rhacm-ztp/cnf-features-deploy/ztp/gitops-subscriptions/argocd/policy/telco-core/" + - "{{ install_directory }}/rhacm-ztp/cnf-features-deploy/ztp/gitops-subscriptions/argocd/policy/telco-core/template-values/" - name: Create Telco Core ZTP kustomization files in cnf-features-deploy template: @@ -45,6 +46,10 @@ dest: "{{ install_directory }}/rhacm-ztp/cnf-features-deploy/ztp/gitops-subscriptions/argocd/policy/telco-core/" - src: release-{{ telco_core_profile_version }}/ns.yaml dest: "{{ install_directory }}/rhacm-ztp/cnf-features-deploy/ztp/gitops-subscriptions/argocd/policy/telco-core/" + - src: release-{{ telco_core_profile_version }}/regional.yaml + dest: "{{ install_directory }}/rhacm-ztp/cnf-features-deploy/ztp/gitops-subscriptions/argocd/policy/telco-core/template-values/" + - src: release-{{ telco_core_profile_version }}/hw-types.yaml + dest: "{{ install_directory }}/rhacm-ztp/cnf-features-deploy/ztp/gitops-subscriptions/argocd/policy/telco-core/template-values/" - name: Copy directory of Telco Core reference CRs into cnf-features-deploy ansible.builtin.copy: diff --git a/ansible/roles/telco-core-ztp/templates/policy-kustomization.yaml b/ansible/roles/telco-core-ztp/templates/policy-kustomization.yaml index 7a10e76..a733edb 100644 --- a/ansible/roles/telco-core-ztp/templates/policy-kustomization.yaml +++ b/ansible/roles/telco-core-ztp/templates/policy-kustomization.yaml @@ -2,11 +2,10 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization generators: - core-baseline.yaml -# Overlay commented out until template-value ConfigMaps completed -# - core-overlay.yaml +- core-overlay.yaml # - core-upgrade.yaml resources: - ns.yaml -# - template-values/regional.yaml -# - template-values/hw-types.yaml +- template-values/regional.yaml +- template-values/hw-types.yaml diff --git a/ansible/roles/telco-core-ztp/templates/release-4.18/hw-types.yaml b/ansible/roles/telco-core-ztp/templates/release-4.18/hw-types.yaml new file mode 100644 index 0000000..6b19fd6 --- /dev/null +++ b/ansible/roles/telco-core-ztp/templates/release-4.18/hw-types.yaml @@ -0,0 +1,22 @@ +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: hw-types + namespace: ztp-core-policies +data: + role-worker-1-reserved: "0,1,32,33" + role-worker-1-isolated: "2-30,34-62,3-31,35-63" + role-worker-1-hugepg-cnt: "6" + + role-worker-2-reserved: "0,1,32,33" + role-worker-2-isolated: "2-30,34-62,3-31,35-63" + role-worker-2-hugepg-cnt: "6" + + role-worker-3-reserved: "0,1,32,33" + role-worker-3-isolated: "2-30,34-62,3-31,35-63" + role-worker-3-hugepg-cnt: "6" + + nic-config-type-1-sriov-dev1: ens1f0 + nic-config-type-1-sriov-dev2: eno1np0 + nic-config-type-1-sriov-numvf: "8" diff --git a/ansible/roles/telco-core-ztp/templates/release-4.18/regional.yaml b/ansible/roles/telco-core-ztp/templates/release-4.18/regional.yaml new file mode 100644 index 0000000..f759185 --- /dev/null +++ b/ansible/roles/telco-core-ztp/templates/release-4.18/regional.yaml @@ -0,0 +1,9 @@ +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: regional + namespace: ztp-core-policies +data: + zone-1-log-url: tcp://10.11.12.13:9002/test + zone-2-log-url: "tcp://192.168.100.100:9002/test"