Merge branch 'uth_fixes' into 'main'

Fixes for running the master branch on the UTH nodes

See merge request !2

README.md

@@ -2,6 +2,23 @@
 
 ## Deployment node
 
+```console
+sudo apt install docker.io
+```
+
+If there is no id_rsa file, create it with the following command:
+
+```console
+ssh-keygen -t rsa
+```
+
+Then copy the .pub file to the $HOME/.ssh/authorized_hosts of all the nodes that will be managed by the deployment container
+```
+cat $HOME/.ssh/id_rsa.pub
+```
+
+To build the deployment container: 
+
 ```console
 docker build -t deployment_node -f Dockerfile .
 ```
@@ -47,4 +64,4 @@ ansible-playbook -i inventories/staging --extra-vars "@params.yaml" --extra-vars
 ## Deploy 5G network
 ```console
 ansible-playbook -i inventories/staging --extra-vars "@params.yaml" --extra-vars "@params.5g.yaml" --extra-vars "@secrets.yaml" --ask-vault-pass 5g.yaml 
-```
\ No newline at end of file
+```

lpg.yaml

@@ -4,7 +4,8 @@
     prometheus_basic_auth_password: "{{ secrets['prometheus_basic_auth_password'] }}"
     grafana_password: "{{ secrets['grafana_password'] }}"
   roles:
+    - docker/tasks
     - grafana-loki-prometheus/prometheus
     - grafana-loki-prometheus/loki
     - grafana-loki-prometheus/grafana
-    
\ No newline at end of file
+    

roles/5g/base/files/gen_oai.py

@@ -134,7 +134,7 @@ def render(templatepath, gcn):
 
 # ==============================================================================
 # load configurations
-with open('roles/5g/templates/manifest.yaml', "r") as file:
+with open('roles/5g/base/templates/manifest.yaml', "r") as file:
   tpls = yaml.safe_load(file)
 
 core = yaml.safe_load(os.environ['params_5g'])
@@ -157,4 +157,4 @@ for item in tpls["templates"]:
     content = render(path, gcn)
   else:
     content = readFile("/".join([tpls["output_dir"], path ]))
-  createFile(content, item['output'])
\ No newline at end of file
+  createFile(content, item['output'])

roles/5g/base/tasks/main.yaml

@@ -10,8 +10,8 @@
     args:
       chdir: oai-cn5g-fed
 
-  - name: generate OAI files
-    ansible.builtin.shell: python3 roles/5g/files/gen_oai.py
+  - name: generate OAI files 
+    ansible.builtin.shell: python3 roles/5g/base/files/gen_oai.py
     environment:
       params_5g:
         GCN: '{{ GCN }}'
@@ -39,4 +39,4 @@
 # # Deploy the UE
 # - name: Deploy the UE
 #   ansible.builtin.include_tasks: 'ue.yaml'
-#   when: GCN.UE is defined and GCN.UE.present
\ No newline at end of file
+#   when: GCN.UE is defined and GCN.UE.present

roles/5g/base/templates/manifest.yaml

-output_dir: roles/5g/templates/oai-cn5g-fed/charts
+output_dir: roles/5g/base/templates/oai-cn5g-fed/charts
 templates:
   - template: oai-5g-core/oai-5g-basic/config.yaml.j2
     output: ./oai-cn5g-fed/charts/oai-5g-core/oai-5g-basic/config.yaml
@@ -22,4 +22,4 @@ templates:
   - template: oai-5g-ran/oai-gnb/templates/configmap.yaml
     output: ./oai-cn5g-fed/charts/oai-5g-ran/oai-gnb/templates/configmap.yaml
   - template: oai-5g-ran/oai-gnb/templates/deployment.yaml
-    output: ./oai-cn5g-fed/charts/oai-5g-ran/oai-gnb/templates/deployment.yaml
\ No newline at end of file
+    output: ./oai-cn5g-fed/charts/oai-5g-ran/oai-gnb/templates/deployment.yaml

roles/post-5g-bp-cluster-monitoring/cadvisor/templates/cadvisor.yaml.j2

@@ -21,11 +21,11 @@ spec:
         - containerPort: 8080
         resources:
           limits:
-            cpu: 200m
-            memory: 200Mi
+            cpu: 300m
+            memory: 400Mi
           requests:
-            cpu: 100m
-            memory: 100Mi
+            cpu: 150m
+            memory: 200Mi
         volumeMounts:
         - name: rootfs
           mountPath: /rootfs