Skip to content
This repository was archived by the owner on Sep 9, 2026. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -176,3 +176,4 @@ tests/integration/kubeconfig-*

# CLAUDE.md
CLAUDE.md
.claude/
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,30 @@
}) }}
when: nat_action == 'snat'

- name: Reset existing NAT check (avoid stale state from prior delete call)
- name: Get existing NAT rules
ansible.builtin.uri:
url: "{{ netris_controller_url }}/api/v2/nat"
method: GET
headers:
Cookie: "connect.sid={{ netris_session_cookie }}"
return_content: true
status_code: 200
timeout: "{{ netris_timeout | default(30) }}"
validate_certs: "{{ netris_validate_certs | default(true) }}"
register: _nat_list_resp
no_log: true
Comment thread
danmanor marked this conversation as resolved.
Resolved

- name: Find NAT rule by name
ansible.builtin.set_fact:
_existing_nat: "{{ (_nat_list_resp.json.data | default([])) | selectattr('name', 'equalto', nat_name) | list | first | default(none) }}"
when: _nat_list_resp.json is mapping

- name: Set nat facts from existing rule (skip creation)
ansible.builtin.set_fact:
_existing_nat: null
nat_id: "{{ _existing_nat.id }}"
nat_already_existed: true
nat_existing_rule: "{{ _existing_nat }}"
when: _existing_nat is defined and _existing_nat is not none

- name: Create NAT rule
ansible.builtin.uri:
Expand All @@ -57,13 +78,17 @@
body: "{{ _nat_body }}"
return_content: true
status_code: [200, 201]
timeout: "{{ netris_timeout | default(30) }}"
validate_certs: "{{ netris_validate_certs | default(true) }}"
register: _nat_create_resp
when: _existing_nat is not defined or _existing_nat is none

- name: Set nat_id from create response
- name: Set nat facts from create response
ansible.builtin.set_fact:
nat_id: "{{ _nat_create_resp.json.data.id | default(_nat_create_resp.json.data) }}"
nat_already_existed: false
when:
- not (_nat_create_resp.skipped | default(false))
- _existing_nat is not defined or _existing_nat is none
- _nat_create_resp is not skipped
- _nat_create_resp is changed or (_nat_create_resp.status | default(0)) in [200, 201]
- _nat_create_resp.json is mapping
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,24 @@
name: netris.controller.auth
when: netris_session_cookie is not defined

- name: Get existing server clusters
ansible.builtin.uri:
url: "{{ netris_controller_url }}/api/v2/server-cluster"
method: GET
headers:
Cookie: "connect.sid={{ netris_session_cookie }}"
return_content: true
status_code: 200
timeout: "{{ netris_timeout | default(30) }}"
validate_certs: "{{ netris_validate_certs | default(true) }}"
register: _sc_list_resp
no_log: true
Comment thread
danmanor marked this conversation as resolved.
Resolved

- name: Find existing server cluster by name
ansible.builtin.set_fact:
_existing_server_cluster: "{{ (_sc_list_resp.json.data | default([])) | selectattr('name', 'equalto', server_cluster_name) | list | first | default(none) }}"
when: _sc_list_resp.json is mapping

- name: Set server names list
ansible.builtin.set_fact:
_server_names: "{{ server_cluster_servers }}"
Expand All @@ -22,6 +40,7 @@
Cookie: "connect.sid={{ netris_session_cookie }}"
return_content: true
status_code: 200
timeout: "{{ netris_timeout | default(30) }}"
validate_certs: "{{ netris_validate_certs | default(true) }}"
register: _inv_resp

Expand All @@ -43,28 +62,61 @@
- server_cluster_servers[0] is mapping
- server_cluster_servers[0].id is defined

- name: Build update body (servers and tags only)
ansible.builtin.set_fact:
_update_body:
servers: "{{ _server_cluster_servers | default([]) }}"
tags: "{{ server_cluster_tags | default([]) }}"
when: _existing_server_cluster is defined and _existing_server_cluster is not none

- name: Update existing server cluster
ansible.builtin.uri:
url: "{{ netris_controller_url }}/api/v2/server-cluster/{{ _existing_server_cluster.id }}"
method: PUT
headers:
Cookie: "connect.sid={{ netris_session_cookie }}"
Content-Type: "application/json"
body_format: json
body: "{{ _update_body }}"
return_content: true
status_code: [200]
timeout: "{{ netris_timeout | default(30) }}"
validate_certs: "{{ netris_validate_certs | default(true) }}"
register: _update_resp
no_log: true
when: _existing_server_cluster is defined and _existing_server_cluster is not none
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Resolved

- name: Build create body (base)
ansible.builtin.set_fact:
_create_body:
name: "{{ server_cluster_name }}"
site: "{{ {'id': server_cluster_site_id | int} }}"
servers: "{{ _server_cluster_servers | default([]) }}"
tags: "{{ server_cluster_tags | default([]) }}"
vpc: "{{ {'id': 0, 'name': 'Create New'} }}"
vpc: >-
{{
{'id': server_cluster_vpc_id | int, 'name': server_cluster_vpc_name | default('')}
if (server_cluster_vpc_id is defined and server_cluster_vpc_id)
else {'id': 0, 'name': 'Create New'}
}}
when: _existing_server_cluster is not defined or _existing_server_cluster is none

- name: Build create body (with template)
ansible.builtin.set_fact:
_create_body: "{{ _create_body | default({}) | combine({'srvClusterTemplate': {'id': server_cluster_template_id}}) }}"
when: server_cluster_template_id is defined
when:
- _existing_server_cluster is not defined or _existing_server_cluster is none
- server_cluster_template_id is defined

- name: Build create body (with admin)
ansible.builtin.set_fact:
_create_body: "{{ _create_body | default({}) | combine({'admin': {'id': server_cluster_admin_id, 'name': server_cluster_admin_name}}) }}"
when:
- _existing_server_cluster is not defined or _existing_server_cluster is none
- server_cluster_admin_id is defined
- server_cluster_admin_name is defined

- name: Create server cluster
- name: Create new server cluster
ansible.builtin.uri:
url: "{{ netris_controller_url }}/api/v2/server-cluster"
method: POST
Expand All @@ -75,35 +127,40 @@
body: "{{ _create_body }}"
return_content: true
status_code: [200, 201]
timeout: "{{ netris_timeout | default(30) }}"
validate_certs: "{{ netris_validate_certs | default(true) }}"
register: _create_resp
when: _existing_server_cluster is not defined or _existing_server_cluster is none

- name: Set server_cluster_id from create response
- name: Set server_cluster_id from response
ansible.builtin.set_fact:
server_cluster_id: "{{ _create_resp.json.data.id | default(_create_resp.json.data) }}"
server_cluster_created: true
when: _create_resp.json is mapping
server_cluster_id: >-
{{
_existing_server_cluster.id
if (_existing_server_cluster is defined and _existing_server_cluster is not none)
else (_create_resp.json.data.id | default(_create_resp.json.data))
}}
server_cluster_created: "{{ _existing_server_cluster is not defined or _existing_server_cluster is none }}"

- name: Wait for server cluster to be provisioned
- name: Wait for server cluster to be active
ansible.builtin.uri:
url: "{{ netris_controller_url }}/api/v2/server-cluster/{{ server_cluster_id }}"
method: GET
headers:
Cookie: "connect.sid={{ netris_session_cookie }}"
return_content: true
status_code: 200
timeout: "{{ netris_timeout | default(30) }}"
validate_certs: "{{ netris_validate_certs | default(true) }}"
register: _state_resp
until: _state_resp.json is mapping and ((_state_resp.json.data | default({}))['status'] | default({}))['label'] | default('') == 'Active'
retries: 30
delay: 10
when: _create_resp.json is mapping

- name: Set server_cluster_vpc_id from provisioned server cluster
- name: Set server_cluster_vpc_id from server cluster
ansible.builtin.set_fact:
server_cluster_vpc_id: "{{ (_state_resp.json.data | default({})).vpc.id | default((_state_resp.json.data | default({})).vpcId) }}"
server_cluster_vpc_name: "{{ (_state_resp.json.data | default({})).vpc.name | default('') }}"
when:
- _create_resp.json is mapping
- _state_resp.json is mapping
- (_state_resp.json.data | default({})).vpc is defined or (_state_resp.json.data | default({})).vpcId is defined
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,19 @@
vars:
manage_agents_cluster_order_name: "{{ cluster_infra_name }}"

- name: List already allocated agents
kubernetes.core.k8s_info:
kind: Agent
api_version: agent-install.openshift.io/v1beta1
namespace: "{{ default_agent_namespace }}"
label_selectors:
- "{{ cluster_order_label }}={{ cluster_infra_name }}"
register: _existing_cluster_agents

- name: Record already allocated agent names
ansible.builtin.set_fact:
_existing_agent_names: "{{ _existing_cluster_agents.resources | map(attribute='metadata.name') | list }}"

- name: Select and label new Agent resources
ansible.builtin.include_role:
name: osac.service.manage_agents
Expand Down Expand Up @@ -128,14 +141,6 @@
server_cluster_template_id: "{{ _netris_server_cluster_template_id }}"
server_cluster_template_state: read

- name: Delete existing Netris server cluster
ansible.builtin.include_role:
name: netris.controller.server_cluster
vars:
server_cluster_name: "{{ cluster_infra_name }}"
server_cluster_state: absent
server_cluster_site_id: "{{ netris_site_id }}"

- name: Create Netris server cluster with attached servers
ansible.builtin.include_role:
name: netris.controller.server_cluster
Expand All @@ -151,27 +156,49 @@
server_cluster_admin_id: "{{ netris_tenant_id }}"
server_cluster_admin_name: "{{ netris_tenant_name }}"

- name: Allocate NAT IP from Netris IPAM
- name: Ensure Netris auth for SNAT lookup
ansible.builtin.include_role:
name: netris.controller.auth
when: netris_session_cookie is not defined

- name: Look up existing SNAT rule
ansible.builtin.uri:
url: "{{ netris_controller_url }}/api/v2/nat"
method: GET
headers:
Cookie: "connect.sid={{ netris_session_cookie }}"
return_content: true
status_code: 200
timeout: "{{ netris_timeout | default(30) }}"
validate_certs: "{{ netris_validate_certs | default(true) }}"
register: _snat_lookup_resp
no_log: true

- name: Find existing SNAT rule by name
ansible.builtin.set_fact:
_existing_snat: "{{ (_snat_lookup_resp.json.data | default([])) | selectattr('name', 'equalto', cluster_infra_name + '-snat') | list | first | default(none) }}"
when: _snat_lookup_resp.json is mapping

- name: Set SNAT IP from existing rule
ansible.builtin.set_fact:
netris_nat_snat_ip: "{{ _existing_snat.snatToIP | ansible.utils.ipaddr('host/prefix') }}"
when: _existing_snat is defined and _existing_snat is not none
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Resolved

- name: Allocate NAT IP from Netris IPAM (new cluster only)
ansible.builtin.include_role:
name: netris.controller.ipam
vars:
ipam_site_id: "{{ netris_site_id }}"
ipam_purpose: nat
ipam_count: 1
when: _existing_snat is not defined or _existing_snat is none

- name: Set dynamically allocated NAT IP
- name: Set dynamically allocated NAT IP (new cluster only)
ansible.builtin.set_fact:
netris_nat_snat_ip: "{{ ipam_allocated_ips[0] }}/32"
when: _existing_snat is not defined or _existing_snat is none

- name: Delete existing SNAT rule for VPC subnet
ansible.builtin.include_role:
name: netris.controller.nat
vars:
nat_name: "{{ cluster_infra_name }}-snat"
nat_state: absent
nat_site_id: "{{ netris_site_id }}"

- name: Create SNAT rule for VPC subnet internet access
- name: Create SNAT rule for VPC subnet internet access (new cluster only)
ansible.builtin.include_role:
name: netris.controller.nat
vars:
Expand All @@ -185,12 +212,17 @@
nat_source_address: "{{ netris_template_ipv4_gateway | ansible.utils.ipsubnet }}"
nat_snat_to_ip: "{{ netris_nat_snat_ip }}"
nat_comment: "OSAC SNAT for {{ cluster_infra_name }}"
when: _existing_snat is not defined or _existing_snat is none

- name: Set cluster_infra_network_name
ansible.builtin.set_fact:
cluster_infra_network_name: "{{ cluster_infra_name }}"

- name: Create NMStateConfig for cluster agents
- name: Identify newly added agents
ansible.builtin.set_fact:
_newly_added_agents: "{{ cluster_agents_for_netris.resources | rejectattr('metadata.name', 'in', _existing_agent_names) | list }}"

- name: Create NMStateConfig CRs for all cluster agents
ansible.builtin.include_role:
name: osac.service.nmstate_config
vars:
Expand All @@ -200,6 +232,19 @@
nmstate_config_interface_names: "{{ server_cluster_template_server_nics }}"
nmstate_config_server_interfaces: "{{ _server_vpc_interfaces }}"
nmstate_config_mgmt_interface: "{{ _server_mgmt_interface }}"
nmstate_config_apply_live: false

- name: Apply NMState config on newly added agents
ansible.builtin.include_role:
name: osac.service.nmstate_config
vars:
nmstate_config_state: present
nmstate_config_cluster_name: "{{ cluster_infra_name }}"
nmstate_config_agents: "{{ _newly_added_agents }}"
nmstate_config_interface_names: "{{ server_cluster_template_server_nics }}"
nmstate_config_server_interfaces: "{{ _server_vpc_interfaces }}"
nmstate_config_mgmt_interface: "{{ _server_mgmt_interface }}"
when: _newly_added_agents | length > 0

- name: Add cluster order label to InfraEnv nmStateConfigLabelSelector
kubernetes.core.k8s:
Expand Down
Loading
Loading