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

Merge branch 'develop' into 'master' 

Fix some bugs

See merge request !1
parents 7e542812 dd65a5dc

.gitignore

+0 −1
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ ansible/.ansible/ 
*.retry

ansible_facts/

ansible/secrets.yml

ansible/inventory/hosts.local.yml



# Automation folder - contains kubeconfig files generated by ansible

automation/

CONTRIBUTING.md

+2 −2
Original line number Diff line number Diff line
@@ -45,8 +45,8 @@ To contribute code, follow these steps: 


1. **Clone the Repository**:

   ```bash

   git clone https://labs.etsi.org/rep/oop/code/integration.git

   cd integration

   git clone git@gitlab.i2cat.net:areas/software-networks/operator-platform/oop/op-automation.git

   cd i2CAT_OP_AUTOMATION

   ```



2. **Create a Feature Branch**:

README.md

+3 −0
Original line number Diff line number Diff line
@@ -10,6 +10,9 @@ Repository scope: 
- deploy two-host federation setups

- fetch kubeconfigs back to local machine



This downstream repository keeps i2CAT-specific inventory and local defaults on

top of the public-safe upstream automation.



## Start here



- `docs/getting-started.md`: environment, inventory, secrets, first deployment

ansible/inventory/group_vars/all/srm.yml

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ oop_namespace: oop 
# Service NodePort

srm_nodeport: 32415



# SRM image

# SRM image (ETSI registry)

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

srm_controller_image_tag: "1.1"

ansible/inventory/hosts.local.yml

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

all:

  hosts:

    openop_1:

      ansible_host: 192.168.123.188

      ansible_connection: ssh

      ansible_user: ubuntu

      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.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: 192.168.123.178

      ansible_connection: ssh

      ansible_user: ubuntu

      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

      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

      ansible_connection: ssh

      ansible_user: ubuntu

      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

      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:

      hosts:

        openop_1:

    op1_nodes:

      hosts:

        openop_3:

    op2_nodes:

      hosts:

        openop_2:

    k8s_clusters:

      children:

        openop_dev:

        op1_nodes:

        op2_nodes: