Fix some bugs

Sergio Gimenezrequested to merge
develop into master

Merge request reports

ansible/inventory/group_vars/all/srm.yml

+1 −1
Changes for ansible/inventory/group_vars/all/srm.yml: 1 added line, 1 removed line.
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
Changes for ansible/inventory/hosts.local.yml: 63 added lines, 0 removed lines.
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:

ansible/inventory/hosts.yml

+28 −5
Changes for ansible/inventory/hosts.yml: 28 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -16,10 +16,29 @@ all: 
      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.0.2.10

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

      # kubeconfig_filename: operator-platform-external-kubeconfig.yaml

      # cluster_name: example-all-in-one

      host_ip: 192.168.123.214

      cluster_name: sunrise-remote

      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"

      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: 193.190.168.50

      cluster_name: op2-remote

      api_server_port: 16443

      kubeconfig_output_dir: /home/i2cat/.kube

      kubeconfig_filename: "config"

      oop_deployment_profile: kubernetes

      deploy_prometheus: false

      skip_prerequisites: true



    example_op_1:

      ansible_host: 198.51.100.11
@@ -69,7 +88,11 @@ all: 
  children:

    openop_dev:

      hosts:

        example_op_1:

        openop_1:

    existing_cluster_nodes:

      hosts:

        openop_sunrise:

        openop_kul:

    op1_nodes:

      hosts:

        example_op_3:

ansible/playbooks/infrastructure/prerequisites/setup-docker.yml

+1 −1
Changes for ansible/playbooks/infrastructure/prerequisites/setup-docker.yml: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
# Usage: ansible-playbook playbooks/infrastructure/prerequisites/setup-docker.yml



- name: Install Docker

  hosts: k8s_clusters

  hosts: "{{ target_hosts | default('k8s_clusters') }}"

  gather_facts: true

  become: true

ansible/playbooks/infrastructure/prerequisites/setup-kubectl.yml

+1 −1
Changes for ansible/playbooks/infrastructure/prerequisites/setup-kubectl.yml: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
# Usage: ansible-playbook playbooks/infrastructure/prerequisites/setup-kubectl.yml



- name: Install kubectl

  hosts: k8s_clusters

  hosts: "{{ target_hosts | default('k8s_clusters') }}"

  gather_facts: true

  become: true