Skip to content

Commit 7444604

Browse files
committed
Add hub side templates for overlay policy
1 parent 02c6b13 commit 7444604

File tree

4 files changed

+39
-4
lines changed

4 files changed

+39
-4
lines changed

ansible/roles/telco-core-ztp/tasks/main.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
- "{{ install_directory }}/rhacm-ztp/cnf-features-deploy/ztp/gitops-subscriptions/argocd/policy-applications/"
1313
- "{{ install_directory }}/rhacm-ztp/cnf-features-deploy/ztp/gitops-subscriptions/argocd/policy/"
1414
- "{{ install_directory }}/rhacm-ztp/cnf-features-deploy/ztp/gitops-subscriptions/argocd/policy/telco-core/"
15+
- "{{ install_directory }}/rhacm-ztp/cnf-features-deploy/ztp/gitops-subscriptions/argocd/policy/telco-core/template-values/"
1516

1617
- name: Create Telco Core ZTP kustomization files in cnf-features-deploy
1718
template:
@@ -45,6 +46,10 @@
4546
dest: "{{ install_directory }}/rhacm-ztp/cnf-features-deploy/ztp/gitops-subscriptions/argocd/policy/telco-core/"
4647
- src: release-{{ telco_core_profile_version }}/ns.yaml
4748
dest: "{{ install_directory }}/rhacm-ztp/cnf-features-deploy/ztp/gitops-subscriptions/argocd/policy/telco-core/"
49+
- src: release-{{ telco_core_profile_version }}/regional.yaml
50+
dest: "{{ install_directory }}/rhacm-ztp/cnf-features-deploy/ztp/gitops-subscriptions/argocd/policy/telco-core/template-values/"
51+
- src: release-{{ telco_core_profile_version }}/hw-types.yaml
52+
dest: "{{ install_directory }}/rhacm-ztp/cnf-features-deploy/ztp/gitops-subscriptions/argocd/policy/telco-core/template-values/"
4853

4954
- name: Copy directory of Telco Core reference CRs into cnf-features-deploy
5055
ansible.builtin.copy:

ansible/roles/telco-core-ztp/templates/policy-kustomization.yaml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@ apiVersion: kustomize.config.k8s.io/v1beta1
22
kind: Kustomization
33
generators:
44
- core-baseline.yaml
5-
# Overlay commented out until template-value ConfigMaps completed
6-
# - core-overlay.yaml
5+
- core-overlay.yaml
76
# - core-upgrade.yaml
87

98
resources:
109
- ns.yaml
11-
# - template-values/regional.yaml
12-
# - template-values/hw-types.yaml
10+
- template-values/regional.yaml
11+
- template-values/hw-types.yaml
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
---
2+
apiVersion: v1
3+
kind: ConfigMap
4+
metadata:
5+
name: hw-types
6+
namespace: ztp-core-policies
7+
data:
8+
role-worker-1-reserved: "0,1,32,33"
9+
role-worker-1-isolated: "2-30,34-62,3-31,35-63"
10+
role-worker-1-hugepg-cnt: "6"
11+
12+
role-worker-2-reserved: "0,1,32,33"
13+
role-worker-2-isolated: "2-30,34-62,3-31,35-63"
14+
role-worker-2-hugepg-cnt: "6"
15+
16+
role-worker-3-reserved: "0,1,32,33"
17+
role-worker-3-isolated: "2-30,34-62,3-31,35-63"
18+
role-worker-3-hugepg-cnt: "6"
19+
20+
nic-config-type-1-sriov-dev1: ens1f0
21+
nic-config-type-1-sriov-dev2: eno1np0
22+
nic-config-type-1-sriov-numvf: "8"
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
---
2+
apiVersion: v1
3+
kind: ConfigMap
4+
metadata:
5+
name: regional
6+
namespace: ztp-core-policies
7+
data:
8+
zone-1-log-url: tcp://10.11.12.13:9002/test
9+
zone-2-log-url: "tcp://192.168.100.100:9002/test"

0 commit comments

Comments
 (0)