Commit c590b109 authored by Sergio Gimenez's avatar Sergio Gimenez
Browse files

Merge branch 'refactor-playbooks' into 'master' 

Refactor playbooks

See merge request areas/software-networks/operator-platform/op-automation!5
parents bab403ab ab4e306c

ansible/automation/1-kind-cluster/nfd-node-labels.yaml

+6 −6
Original line number Diff line number Diff line
@@ -9,8 +9,8 @@ metadata: 
  namespace: extra-node-feature

spec:

  labels:

    feature.node.kubernetes.io/zoneID: "Omega12345"

    feature.node.kubernetes.io/geolocation: "p41.388043_p2.114966"

    feature.node.kubernetes.io/zoneID: "0f8c8424-a5bf-4c2e-a6da-0ff2b5a47ed1"

    feature.node.kubernetes.io/geolocation: "41.388043_2.114966"

    feature.node.kubernetes.io/geographyDetails: "university_city_env"

---

apiVersion: nfd.k8s-sigs.io/v1alpha1
@@ -22,8 +22,8 @@ metadata: 
  namespace: extra-node-feature

spec:

  labels:

    feature.node.kubernetes.io/zoneID: "Omega12345"

    feature.node.kubernetes.io/geolocation: "p41.388043_p2.114966"

    feature.node.kubernetes.io/zoneID: "0f8c8424-a5bf-4c2e-a6da-0ff2b5a47ed1"

    feature.node.kubernetes.io/geolocation: "41.388043_2.114966"

    feature.node.kubernetes.io/geographyDetails: "university_city_env"

---

apiVersion: nfd.k8s-sigs.io/v1alpha1
@@ -35,7 +35,7 @@ metadata: 
  namespace: extra-node-feature

spec:

  labels:

    feature.node.kubernetes.io/zoneID: "Omega12345"

    feature.node.kubernetes.io/geolocation: "p41.388043_p2.114966"

    feature.node.kubernetes.io/zoneID: "0f8c8424-a5bf-4c2e-a6da-0ff2b5a47ed1"

    feature.node.kubernetes.io/geolocation: "41.388043_2.114966"

    feature.node.kubernetes.io/geographyDetails: "university_city_env"

---

ansible/group_vars/all.yml

+2 −2
Original line number Diff line number Diff line
@@ -166,8 +166,8 @@ nfd_apply_custom_labels: true 


# Custom node labels

nfd_custom_labels:

  zoneID: "Omega12345"

  geolocation: "p41.388043_p2.114966"

  zoneID: "0f8c8424-a5bf-4c2e-a6da-0ff2b5a47ed1"

  geolocation: "41.388043_2.114966"

  geographyDetails: "university_city_env"



# ==========================================

ansible/roles/artefact-manager/defaults/main.yml

+2 −2
Original line number Diff line number Diff line 
---

artefact_manager_image: "ghcr.io/sunriseopenoperatorplatform/artefactmanager"

artefact_manager_tag: "0.5"

artefact_manager_image: "ghcr.io/sergio-gimenez/artefact-manager"

artefact_manager_tag: "main"

artefact_manager_namespace: "artefact-manager"

artefact_manager_replicas: 1

artefact_manager_container_port: 8000

ansible/roles/federation-manager-remote/defaults/main.yml

+5 −5
Original line number Diff line number Diff line
@@ -38,12 +38,12 @@ remote_federation_manager_op_fixed_network_code: "33" 
remote_federation_manager_op_platform_caps: "homeRouting"



# Edge Cloud Platform (i2edge)

remote_federation_manager_ecp_host: "i2edge-remote"

remote_federation_manager_ecp_port: 30770

remote_federation_manager_ecp_client_name: "i2edge-remote"

remote_federation_manager_ecp_host: "{{ external_host_ip }}"

remote_federation_manager_ecp_port: "{{ i2edge_nodeport }}"

remote_federation_manager_ecp_client_name: "i2edge"

remote_federation_manager_ecp_flavour_id: "default-flavour"



# Artefact Manager

remote_federation_manager_am_host: "artefact-manager-remote"

remote_federation_manager_am_port: 8001

remote_federation_manager_am_host: "{{ external_host_ip }}"

remote_federation_manager_am_port: "{{ artefact_manager_nodeport }}"

remote_federation_manager_am_enabled: "true"

ansible/roles/federation-manager/defaults/main.yml

+4 −4
Original line number Diff line number Diff line
@@ -38,12 +38,12 @@ federation_manager_op_fixed_network_code: "34" 
federation_manager_op_platform_caps: "homeRouting"



# Edge Cloud Platform (i2edge)

federation_manager_ecp_host: "i2edge"

federation_manager_ecp_port: 30769

federation_manager_ecp_host: "{{ external_host_ip }}"

federation_manager_ecp_port: "{{ i2edge_nodeport }}"

federation_manager_ecp_client_name: "i2edge"

federation_manager_ecp_flavour_id: "default-flavour"



# Artefact Manager

federation_manager_am_host: "artefact-manager"

federation_manager_am_port: 8000

federation_manager_am_host: "{{ external_host_ip }}"

federation_manager_am_port: "{{ artefact_manager_nodeport }}"

federation_manager_am_enabled: "true"