Commit 9aee0cf0 authored by Sergio Gimenez's avatar Sergio Gimenez
Browse files

Update OEG and FM defaults for federation

parent 0f2945f6

ansible/inventory/group_vars/all/all.yml

+1 −1
Original line number Diff line number Diff line
@@ -58,6 +58,6 @@ cert_sans: 
# ==========================================

# Automatically uses host IP, falls back to localhost

kubeconfig_server_host: "{{ ansible_default_ipv4.address | default('localhost') }}"

kubeconfig_server_url: "https://{{ kubeconfig_server_host }}:6443"

kubeconfig_server_url: "https://{{ kubeconfig_server_host }}:{{ api_server_port }}"

kubeconfig_output_dir: "{{ op_automation_base }}/automation/1-kind-cluster"

kubeconfig_filename: operator-platform-external-kubeconfig.yaml

ansible/inventory/group_vars/all/federation_manager.yml

+14 −0
Original line number Diff line number Diff line
@@ -53,6 +53,12 @@ federation_manager_remote: 
  namespace: "federation-manager-remote"

  nodeport: 30990

  

  # Edge Cloud Platform (Lite2Edge)

  ecp_host: "lite2edge.lite2edge.svc.cluster.local"

  ecp_port: 80

  ecp_client_name: "lite2edge"

  ecp_flavour_id: "default"

  

  # Keycloak settings

  keycloak_nodeport: 30083

  keycloak_client1_id: "remote-op-1"
@@ -71,3 +77,11 @@ federation_manager_remote: 
  op_mnc: "02"

  op_fixed_network_code: "33"

  op_platform_caps: "homeRouting"



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

# Default Edge Cloud Platform (Lite2Edge)

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

federation_manager_ecp_host: "lite2edge.lite2edge.svc.cluster.local"

federation_manager_ecp_port: 80

federation_manager_ecp_client_name: "lite2edge"

federation_manager_ecp_flavour_id: "default"

ansible/inventory/group_vars/all/srm.yml

+9 −0
Original line number Diff line number Diff line
@@ -11,3 +11,12 @@ oop_namespace: oop 


# Service NodePort

srm_nodeport: 32415



# SRM image (i2cat registry)

srm_controller_image_repository: "gitlab.i2cat.net:5050/areas/software-networks/operator-platform/service-resource-manager"

srm_controller_image_tag: "latest"



# SRM EdgeCloud adapter configuration

# Use lite2edge service inside the cluster

srm_edge_cloud_adapter_name: lite2edge

srm_adapter_base_url: "http://lite2edge.lite2edge.svc.cluster.local"

ansible/inventory/hosts.yml

+15 −5
Original line number Diff line number Diff line
@@ -18,26 +18,36 @@ all: 
      deployment_mode: remote

      host_ip: 192.168.123.188

      kubeconfig_output_dir: "/home/ubuntu/kind-cluster-config"

      kubeconfig_filename: operator-platform-external-kubeconfig.yaml

      cluster_name: dev-all-in-one



    openop_2:

      ansible_host: openop-2

      ansible_host: 192.168.123.178

      ansible_connection: ssh

      ansible_user: ubuntu

      ansible_ssh_common_args: '-o StrictHostKeyChecking=no -o ConnectTimeout=300 -o ServerAliveInterval=30'

      ansible_ssh_private_key_file: "~/.ssh/keys/openop-dev-vm.key"

      ansible_ssh_common_args: '-o StrictHostKeyChecking=no -o ConnectTimeout=300 -o ServerAliveInterval=30 -o IdentitiesOnly=yes'

      ansible_python_interpreter: /usr/bin/python3

      deployment_mode: remote

      host_ip: 192.168.123.178

      kubeconfig_output_dir: "/home/ubuntu/kind-cluster-config"

      kubeconfig_filename: op2-kubeconfig.yaml

      cluster_name: node-2

      api_server_port: 6444



    openop_3:

      ansible_host: openop-3

      ansible_host: 192.168.123.155

      ansible_connection: ssh

      ansible_user: ubuntu

      ansible_ssh_common_args: '-o StrictHostKeyChecking=no -o ConnectTimeout=300 -o ServerAliveInterval=30'

      ansible_ssh_private_key_file: "~/.ssh/keys/openop-dev-vm.key"

      ansible_ssh_common_args: '-o StrictHostKeyChecking=no -o ConnectTimeout=300 -o ServerAliveInterval=30 -o IdentitiesOnly=yes'

      ansible_python_interpreter: /usr/bin/python3

      deployment_mode: remote

      host_ip: 192.168.123.155

      kubeconfig_output_dir: "/home/ubuntu/kind-cluster-config"

      kubeconfig_filename: op1-kubeconfig.yaml

      cluster_name: node-1

      api_server_port: 6443



  children:

    openop_dev:
@@ -49,7 +59,7 @@ all: 
    op2_nodes:

      hosts:

        openop_2:

    k8s_cluster:

    k8s_clusters:

      children:

        openop_dev:

        op1_nodes:

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

+14 −12
Original line number Diff line number Diff line
@@ -19,13 +19,12 @@ federation_manager_namespace: "federation-manager" 


# Kubeconfig

# K8s-distro-agnostic kubeconfig path

federation_manager_kubeconfig: "{{ kubeconfig_dir }}/{{ kubeconfig_filename }}"

federation_manager_kubeconfig: "{{ kubeconfig_path | default(kubeconfig_dir ~ '/' ~ kubeconfig_filename) }}"



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

# Federation Manager Image

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

federation_manager_image: "gitlab.i2cat.net:5050/areas/software-networks/operator-platform/federation-manager/federation-manager-i2cat"

#federation_manager_image: "labs.etsi.org:5050/oop/code/federation-manager/federation-manager"

federation_manager_image: "gitlab.i2cat.net:5050/areas/software-networks/operator-platform/federation-manager/federation-manager-i2cat" #federation_manager_image: "labs.etsi.org:5050/oop/code/federation-manager/federation-manager"

federation_manager_tag: "latest"

federation_manager_replicas: 1

federation_manager_container_port: 8989
@@ -59,6 +58,7 @@ federation_manager_mongodb_image: "mongo" 
federation_manager_mongodb_tag: "6.0"

federation_manager_mongodb_nodeport: 30017

federation_manager_mongodb_data_dir: "/tmp/db"

federation_manager_mongodb_cleanup_data: true



# Federation Manager MongoDB settings

federation_manager_mongodb_host: "mongodb"
@@ -77,20 +77,22 @@ federation_manager_op_platform_caps: "homeRouting" 
# ==========================================

# Edge Cloud Platform Integration

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

federation_manager_ecp_host: "{{ external_host_ip | default(host_ip) | default(ansible_host) | default('HOST_IP') }}"

federation_manager_ecp_port: "{{ i2edge_nodeport }}"

federation_manager_ecp_client_name: "i2edge"

federation_manager_ecp_flavour_id: "default-flavour"

federation_manager_ecp_host: "lite2edge.lite2edge.svc.cluster.local"

federation_manager_ecp_port: 8080

federation_manager_ecp_client_name: "lite2edge"

federation_manager_ecp_flavour_id: "default"



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

# Artefact Manager Integration

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

federation_manager_am_host: "{{ external_host_ip | default(host_ip) | default(ansible_host) | default('HOST_IP') }}"

federation_manager_am_port: "{{ artefact_manager_nodeport }}"

federation_manager_am_host: "artefact-manager.artefact-manager.svc.cluster.local"

federation_manager_am_port: 8000

federation_manager_am_enabled: "true"

federation_manager_am_dst_registry: "{{ external_host_ip | default(host_ip) | default(ansible_host) | default('HOST_IP') }}:{{ zot_http_nodeport }}"

federation_manager_am_dst_username: "admin"

federation_manager_am_dst_password: "Harbor12345"

# Destination registry for artefact-manager copies (reachable from cluster). Default: internal Zot service.

federation_manager_am_dst_registry: "zot.zot.svc.cluster.local:5000"

federation_manager_am_dst_username: ""

federation_manager_am_dst_password: ""

federation_manager_am_dst_token: ""



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

# Deployment Settings