Commit 2c3152ba authored by Sergio Gimenez's avatar Sergio Gimenez
Browse files

feat: add dual-oop deployment profiles 

Keep kubernetes and lite2edge VM runs aligned through profile-selected SRM and federation settings. Also fix host-specific cluster access and operator naming so the same smoke flows work on openop_3 and openop_2.
parent b1dfa92b

ansible/inventory/group_vars/all/federation_manager.yml

+14 −8
Original line number Diff line number Diff line
@@ -53,10 +53,10 @@ 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"

  # Edge Cloud Platform (Kubernetes)

  ecp_host: "kubernetes.default.svc.cluster.local"

  ecp_port: 443

  ecp_client_name: "kubernetes"

  ecp_flavour_id: "default"

  

  # Keycloak settings
@@ -79,9 +79,15 @@ federation_manager_remote: 
  op_platform_caps: "homeRouting"



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

# Default Edge Cloud Platform (Lite2Edge)

# Default Service Resource Manager

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

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

federation_manager_ecp_port: 80

federation_manager_ecp_client_name: "lite2edge"

federation_manager_srm_host: "srm.oop.svc.cluster.local"

federation_manager_srm_port: 8080



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

# Default Edge Cloud Platform (Kubernetes)

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

federation_manager_ecp_host: "kubernetes.default.svc.cluster.local"

federation_manager_ecp_port: 443

federation_manager_ecp_client_name: "kubernetes"

federation_manager_ecp_flavour_id: "default"

ansible/inventory/group_vars/all/lite2edge.yml

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
#   - lite2edge: Deploy lite2edge platform (default, lightweight)

#   - i2edge: Deploy i2edge platform (full-featured)

#   - none: Skip edgecloud platform deployment

edgecloud_platform: lite2edge

edgecloud_platform: none



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

# lite2edge Configuration (only used when edgecloud_platform=lite2edge)

ansible/inventory/group_vars/all/srm.yml

+5 −5
Original line number Diff line number Diff line
@@ -13,10 +13,10 @@ oop_namespace: oop 
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_controller_image_repository: "gitlab.i2cat.net:5050/areas/software-networks/operator-platform/oop/service-resource-manager"

srm_controller_image_tag: "feature-srm-fm-integration-v7"



# 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"
 
# Use kubernetes adapter

srm_edge_cloud_adapter_name: kubernetes

srm_adapter_base_url: "https://kubernetes.default.svc.cluster.local"

ansible/inventory/hosts.yml

+4 −0
Original line number Diff line number Diff line
@@ -48,6 +48,8 @@ all: 
      kubeconfig_filename: op2-kubeconfig.yaml

      cluster_name: node-2

      api_server_port: 6444

      oeg_partner_api_root: "http://192.168.123.155:30989"

      oeg_avail_zone_notif_link: "http://192.168.123.178:32263/oeg/1.0.0/availability-zones/notifications"



    openop_3:

      ansible_host: 192.168.123.155
@@ -62,6 +64,8 @@ all: 
      kubeconfig_filename: op1-kubeconfig.yaml

      cluster_name: node-1

      api_server_port: 6443

      oeg_partner_api_root: "http://192.168.123.178:30989"

      oeg_avail_zone_notif_link: "http://192.168.123.155:32263/oeg/1.0.0/availability-zones/notifications"



  children:

    openop_dev:

ansible/inventory/profiles/kubernetes.yml

0 → 100644
+11 −0
Original line number Diff line number Diff line 
---

oop_profile_name: kubernetes

oop_profile_edgecloud_platform: none

oop_profile_srm_edge_cloud_adapter_name: kubernetes

oop_profile_srm_adapter_base_url: "https://kubernetes.default.svc.cluster.local"

oop_profile_federation_manager_ecp_host: "kubernetes.default.svc.cluster.local"

oop_profile_federation_manager_ecp_port: 443

oop_profile_federation_manager_ecp_client_name: kubernetes

oop_profile_remote_federation_manager_ecp_host: "kubernetes.default.svc.cluster.local"

oop_profile_remote_federation_manager_ecp_port: 443

oop_profile_remote_federation_manager_ecp_client_name: kubernetes