Skip to content

Commit 2d6f268

Browse files
llpetersonllpeterson
committed
merge with master
Signed-off-by: Larry Peterson <[email protected]>
2 parents 188d4a5 + e391560 commit 2d6f268

File tree

10 files changed

+48
-47
lines changed

10 files changed

+48
-47
lines changed

‎roles/core/defaults/main.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ core:
77
helm:
88
local_charts: false
99
chart_ref: aether/sd-core
10-
chart_version: 1.0.4
10+
chart_version: 2.0.0

‎roles/core/tasks/install.yml‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
11
---
22

3-
- name: add cord chart repo
4-
kubernetes.core.helm_repository:
5-
name: cord
6-
repo_url: "https://charts.opencord.org"
7-
when: inventory_hostname in groups['master_nodes'] and not core.helm.local_charts
8-
93
- name: add aether chart repo
104
kubernetes.core.helm_repository:
115
name: aether
@@ -85,7 +79,7 @@
8579
kubernetes.core.helm:
8680
update_repo_cache: true
8781
name: sd-core
88-
release_namespace: omec
82+
release_namespace: aether-5gc
8983
create_namespace: true
9084
chart_ref: "{{ core.helm.chart_ref if core.helm.local_charts == false else chart_ref_sd_core }}"
9185
chart_version: "{{ core.helm.chart_version }}"
@@ -98,7 +92,7 @@
9892

9993
rescue:
10094
- name: Get Pods Status
101-
shell: kubectl get po -n omec
95+
shell: kubectl get po -n aether-5gc
10296
register: pod_status
10397
changed_when: false
10498
when: inventory_hostname in groups['master_nodes']
@@ -110,7 +104,7 @@
110104
status=$(echo "$line" | awk '{print $3}')
111105
112106
if [[ "$status" != "Running" ]]; then
113-
kubectl delete pod "$name" -n omec
107+
kubectl delete pod "$name" -n aether-5gc
114108
fi
115109
done <<< "{{ pod_status.stdout }}"
116110
args:

‎roles/core/tasks/uninstall.yml‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
- name: remove aether 5gc
1111
kubernetes.core.helm:
1212
name: sd-core
13-
release_namespace: omec
13+
release_namespace: aether-5gc
1414
state: absent
1515
wait: true
1616
when: inventory_hostname in groups['master_nodes']
@@ -24,23 +24,15 @@
2424
when: inventory_hostname in groups['master_nodes']
2525
ignore_errors: yes
2626

27-
- name: remove cord chart repo
28-
kubernetes.core.helm_repository:
29-
name: cord
30-
state: absent
31-
repo_url: "https://charts.opencord.org"
32-
when: inventory_hostname in groups['master_nodes']
33-
ignore_errors: yes
34-
3527
- name: waiting for aether pods to terminate
3628
shell: |
37-
kubectl wait -n omec --for=delete --all=true -l app!=ue pod --timeout=180s
29+
kubectl wait -n aether-5gc --for=delete --all=true -l app!=ue pod --timeout=180s
3830
when: inventory_hostname in groups['master_nodes']
3931
ignore_errors: yes
4032

41-
- name: delete namespace omec
33+
- name: delete namespace aether-5gc
4234
shell: |
43-
kubectl delete namespace omec
35+
kubectl delete namespace aether-5gc
4436
when: inventory_hostname in groups['master_nodes']
4537
ignore_errors: yes
4638

‎roles/core/templates/radio-5g-values.yaml‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ omec-control-plane:
3030
enabled: false
3131
architecture: replicaset
3232
replicaCount: 2
33+
3334
resources:
3435
enabled: false
3536

@@ -38,10 +39,8 @@ omec-control-plane:
3839
# # network function
3940
# AMF:
4041
# debugLevel: trace
41-
# ReportCaller: false
4242
# SMF:
4343
# debugLevel: trace
44-
# ReportCaller: false
4544

4645
mongodb:
4746
name: free5gc
@@ -70,30 +69,36 @@ omec-control-plane:
7069
# directly provided through Helm Charts
7170
amf:
7271
cfgFiles:
73-
amfcfg.conf:
72+
amfcfg.yaml:
7473
configuration:
7574
enableDBStore: true # Store AMF subscribers in the datastore
7675

7776
# SMF config override. Refer to Helm Charts values for more options
7877
smf:
7978
cfgFiles:
80-
smfcfg.conf:
79+
smfcfg.yaml:
8180
configuration:
8281
enableDBStore: true # Store SMF subscribers in the datastore
8382

8483
#pcf:
8584
# cfgFiles:
86-
# pcfcfg.conf:
85+
# pcfcfg.yaml:
8786
# configuration:
8887

8988
nrf:
9089
cfgFiles:
91-
nrfcfg.conf:
90+
nrfcfg.yaml:
9291
configuration:
9392
mongoDBStreamEnable: false # enable/disable MongoDB stream in NRF
9493
nfProfileExpiryEnable: true # If enabled, remove NF profile if no keepalive received
9594
nfKeepAliveTime: 60 # default timeout for NF profiles
9695

96+
webui:
97+
cfgFiles:
98+
webuicfg.yaml:
99+
configuration:
100+
managedByConfigPod:
101+
enabled: {{ not core.standalone }}
97102

98103
# Override values for omec-sub-provision (subscriber) Helm Chart
99104
# https://github.com/omec-project/sdcore-helm-charts/blob/main/omec-sub-provision/values.yaml

‎roles/core/templates/sdcore-5g-sriov-values.yaml‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ omec-control-plane:
3030
enabled: false
3131
architecture: replicaset
3232
replicaCount: 2
33+
3334
resources:
3435
enabled: false
3536

@@ -38,10 +39,8 @@ omec-control-plane:
3839
# # network function
3940
# AMF:
4041
# debugLevel: trace
41-
# ReportCaller: false
4242
# SMF:
4343
# debugLevel: trace
44-
# ReportCaller: false
4544

4645
mongodb:
4746
name: free5gc
@@ -70,30 +69,36 @@ omec-control-plane:
7069
# directly provided through Helm Charts
7170
amf:
7271
cfgFiles:
73-
amfcfg.conf:
72+
amfcfg.yaml:
7473
configuration:
7574
enableDBStore: true # Store AMF subscribers in the datastore
7675

7776
# SMF config override. Refer to Helm Charts values for more options
7877
smf:
7978
cfgFiles:
80-
smfcfg.conf:
79+
smfcfg.yaml:
8180
configuration:
8281
enableDBStore: true # Store SMF subscribers in the datastore
8382

8483
#pcf:
8584
# cfgFiles:
86-
# pcfcfg.conf:
85+
# pcfcfg.yaml:
8786
# configuration:
8887

8988
nrf:
9089
cfgFiles:
91-
nrfcfg.conf:
90+
nrfcfg.yaml:
9291
configuration:
9392
mongoDBStreamEnable: false # enable/disable MongoDB stream in NRF
9493
nfProfileExpiryEnable: true # If enabled, remove NF profile if no keepalive received
9594
nfKeepAliveTime: 60 # default timeout for NF profiles
9695

96+
webui:
97+
cfgFiles:
98+
webuicfg.yaml:
99+
configuration:
100+
managedByConfigPod:
101+
enabled: {{ not core.standalone }}
97102

98103
# Override values for omec-sub-provision (subscriber) Helm Chart
99104
# https://github.com/omec-project/sdcore-helm-charts/blob/main/omec-sub-provision/values.yaml

‎roles/core/templates/sdcore-5g-values.yaml‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ omec-control-plane:
3030
enabled: false
3131
architecture: replicaset
3232
replicaCount: 2
33+
3334
resources:
3435
enabled: false
3536

@@ -38,10 +39,8 @@ omec-control-plane:
3839
# # network function
3940
# AMF:
4041
# debugLevel: trace
41-
# ReportCaller: false
4242
# SMF:
4343
# debugLevel: trace
44-
# ReportCaller: false
4544

4645
mongodb:
4746
name: free5gc
@@ -70,30 +69,36 @@ omec-control-plane:
7069
# directly provided through Helm Charts
7170
amf:
7271
cfgFiles:
73-
amfcfg.conf:
72+
amfcfg.yaml:
7473
configuration:
7574
enableDBStore: true # Store AMF subscribers in the datastore
7675

7776
# SMF config override. Refer to Helm Charts values for more options
7877
smf:
7978
cfgFiles:
80-
smfcfg.conf:
79+
smfcfg.yaml:
8180
configuration:
8281
enableDBStore: true # Store SMF subscribers in the datastore
8382

8483
#pcf:
8584
# cfgFiles:
86-
# pcfcfg.conf:
85+
# pcfcfg.yaml:
8786
# configuration:
8887

8988
nrf:
9089
cfgFiles:
91-
nrfcfg.conf:
90+
nrfcfg.yaml:
9291
configuration:
9392
mongoDBStreamEnable: false # enable/disable MongoDB stream in NRF
9493
nfProfileExpiryEnable: true # If enabled, remove NF profile if no keepalive received
9594
nfKeepAliveTime: 60 # default timeout for NF profiles
9695

96+
webui:
97+
cfgFiles:
98+
webuicfg.yaml:
99+
configuration:
100+
managedByConfigPod:
101+
enabled: {{ not core.standalone }}
97102

98103
# Override values for omec-sub-provision (subscriber) Helm Chart
99104
# https://github.com/omec-project/sdcore-helm-charts/blob/main/omec-sub-provision/values.yaml
@@ -112,7 +117,7 @@ omec-sub-provision:
112117
configuration:
113118
provision-network-slice: {{ core.standalone | string }} # if enabled, Device Groups & Slices configure by simapp
114119
sub-provision-endpt:
115-
addr: webui.omec.svc.cluster.local # subscriber configuation endpoint.
120+
addr: webui # subscriber configuation endpoint.
116121
# sub-proxy-endpt: # used if subscriber proxy is enabled in the ROC.
117122
# addr: subscriber-proxy.aether-roc.svc.cluster.local
118123
# port: 5000

‎roles/upf/defaults/main.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ core:
66
helm:
77
local_charts: false
88
chart_ref: aether/bess-upf
9-
chart_version: 1.0.2
9+
chart_version: 1.1.1
1010
values_file: "roles/upf/templates/upf-5g-values.yaml"
1111
additional_upfs:
1212
"1":

‎roles/upf/tasks/install.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
kubernetes.core.helm:
4141
update_repo_cache: true
4242
name: bess-upf
43-
release_namespace: omec-upf-{{ item.key }}
43+
release_namespace: aether-5gc-upf-{{ item.key }}
4444
create_namespace: true
4545
chart_ref: "{{ core.upf.helm.chart_ref }}"
4646
chart_version: "{{ core.upf.helm.chart_version }}"

‎roles/upf/tasks/uninstall.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,16 @@
1111
- name: remove aether upfs
1212
kubernetes.core.helm:
1313
name: bess-upf
14-
release_namespace: omec-upf-{{ item.key }}
14+
release_namespace: aether-5gc-upf-{{ item.key }}
1515
state: absent
1616
wait: true
1717
with_dict: "{{ core.upf.additional_upfs}}"
1818
when: inventory_hostname in groups['master_nodes']
1919
ignore_errors: yes
2020

21-
- name: delete namespace omec-upf
21+
- name: delete namespace aether-5gc-upf
2222
shell: |
23-
kubectl delete namespace omec-upf-{{ item.key }}
23+
kubectl delete namespace aether-5gc-upf-{{ item.key }}
2424
with_dict: "{{ core.upf.additional_upfs}}"
2525
when: inventory_hostname in groups['master_nodes']
2626
ignore_errors: yes

‎vars/main.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ core:
77
helm:
88
local_charts: false
99
chart_ref: aether/sd-core
10-
chart_version: 1.0.4
10+
chart_version: 2.0.0
1111

1212
upf:
1313
access_subnet: "192.168.252.1/24" # access subnet & gateway

0 commit comments

Comments
 (0)