Commit 1a9b7814 authored by Sergio Gimenez's avatar Sergio Gimenez
Browse files

Deployment works in existing cluster + merged OOP core services in a single namespace

parent 5771b243

ansible/inventory/group_vars/all/srm.yml

+2 −2
Original line number Diff line number Diff line
@@ -12,8 +12,8 @@ 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/oop/service-resource-manager"

# SRM image (ETSI registry)

srm_controller_image_repository: "labs.etsi.org:5050/oop/code/service-resource-manager"

srm_controller_image_tag: "1.1"



# SRM EdgeCloud adapter configuration

ansible/inventory/hosts.yml

+6 −2
Original line number Diff line number Diff line
@@ -21,12 +21,13 @@ all: 
      api_server_port: 16443

      kubeconfig_output_dir: "/home/ubuntu/.kube"

      kubeconfig_filename: "config"

      oop_deployment_profile: lite2edge



    openop_kul:

      ansible_host: 193.190.168.50

      ansible_connection: ssh

      ansible_user: i2cat

      ansible_ssh_private_key_file: "~/.ssh/keys/sn-keypair.pem"

      ansible_ssh_private_key_file: "~/.ssh/keys/sn-keypair"

      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
@@ -35,6 +36,9 @@ all: 
      api_server_port: 16443

      kubeconfig_output_dir: /home/i2cat/.kube

      kubeconfig_filename: "config"

      oop_deployment_profile: kubernetes

      deploy_prometheus: false

      skip_prerequisites: true





    openop_1:
@@ -89,7 +93,7 @@ all: 
    existing_cluster_nodes:

      hosts:

        openop_sunrise:

        example_op_2:

        openop_kul:

    op1_nodes:

      hosts:

        openop_3:

ansible/playbooks/scenarios/README.md

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ One complete Operator Platform on a host that already has a running cluster. 


```bash

ansible-playbook playbooks/scenarios/full_oop_existing_cluster/deploy.yml --limit openop_sunrise

ansible-playbook playbooks/scenarios/full_oop_existing_cluster/deploy.yml --limit example_op_2

ansible-playbook playbooks/scenarios/full_oop_existing_cluster/deploy.yml --limit openop_kul

```



## Undeploy

ansible/playbooks/scenarios/dual_oop/deploy.yml

+10 −0
Original line number Diff line number Diff line
@@ -24,6 +24,11 @@ 


  vars:

    # OP1-specific configuration

    oop_core_namespace: oop

    oop_federation_manager_namespace: "{{ oop_core_namespace }}"

    oop_artefact_manager_namespace: "{{ oop_core_namespace }}"

    oop_zot_namespace: "{{ oop_core_namespace }}"

    oop_homer_namespace: "{{ oop_core_namespace }}"

    kind_cluster_name: "op1"

    cluster_name: "{{ kind_cluster_name }}"

    worker_nodes: 0
@@ -155,6 +160,11 @@ 


  vars:

    # OP2-specific configuration

    oop_core_namespace: oop

    oop_federation_manager_namespace: "{{ oop_core_namespace }}"

    oop_artefact_manager_namespace: "{{ oop_core_namespace }}"

    oop_zot_namespace: "{{ oop_core_namespace }}"

    oop_homer_namespace: "{{ oop_core_namespace }}"

    kind_cluster_name: "op2"

    cluster_name: "{{ kind_cluster_name }}"

    worker_nodes: 0

ansible/playbooks/scenarios/dual_oop/graceful_undeploy.yml

+10 −0
Original line number Diff line number Diff line
@@ -13,6 +13,11 @@ 
  

  vars:

    # OP1-specific configuration

    oop_core_namespace: oop

    oop_federation_manager_namespace: "{{ oop_core_namespace }}"

    oop_artefact_manager_namespace: "{{ oop_core_namespace }}"

    oop_zot_namespace: "{{ oop_core_namespace }}"

    oop_homer_namespace: "{{ oop_core_namespace }}"

    kind_cluster_name: "op1"

    cluster_name: "{{ kind_cluster_name }}"

    kubeconfig_filename: "op1-kubeconfig.yaml"
@@ -131,6 +136,11 @@ 
  

  vars:

    # OP2-specific configuration

    oop_core_namespace: oop

    oop_federation_manager_namespace: "{{ oop_core_namespace }}"

    oop_artefact_manager_namespace: "{{ oop_core_namespace }}"

    oop_zot_namespace: "{{ oop_core_namespace }}"

    oop_homer_namespace: "{{ oop_core_namespace }}"

    kind_cluster_name: "op2"

    cluster_name: "{{ kind_cluster_name }}"

    kubeconfig_filename: "op2-kubeconfig.yaml"