Skip to content

feat: update cluster setup scripts for ONTAP 9 unified compatibility #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mahatvagarg wants to merge 3 commits into
base: main
Choose a base branch
from
Open

feat: update cluster setup scripts for ONTAP 9 unified compatibility #31

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9b81cff
feat: update cluster setup scripts for ONTAP 9 unified compatibility
mahatvagarg May 13, 2026
465dc70
feat: update cluster setup script for unified compatibility and impro…
mahatvagarg May 13, 2026
0a66b7d
fix: remove unnecessary --fail argument from TruffleHog scan
mahatvagarg May 13, 2026
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
4 changes: 2 additions & 2 deletions ansible/cluster_setup.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
# -e cluster_name=my_cluster -e cluster_pass=MySecret123 \
# -e partner_mgmt_ip=10.10.10.2
#
- name: "Basic Storage Cluster Setup"
- name: "Basic Storage Cluster Setup (ONTAP 9 unified)"
hosts: ontap
gather_facts: false
connection: local
Expand All @@ -45,7 +45,7 @@
# -- REST API defaults ----------------------------------------------
api_url_base: "https://{{ ontap_hostname }}/api"
api_auth: "{{ ontap_username }}:{{ ontap_password }}"
node_query_fields: "name,model,state,ha,version,serial_number,membership,cluster_interfaces,management_interfaces,metrocluster,disaggregated,san_optimized"
node_query_fields: "name,model,state,ha,version,serial_number,membership,cluster_interfaces,management_interfaces,metrocluster"

tasks:
# -- Pre-flight checks ----------------------------------------------
Expand Down Expand Up @@ -117,7 +117,7 @@
# -- Step 3: Discover partner node (exclude local uuid) -------------
- name: "Discover partner node (retry 3x / 30s)"
ansible.builtin.uri:
url: "{{ api_url_base }}/cluster/nodes?fields={{ node_query_fields }}&membership=available&uuid=!{{ discover_local.json.records[0].uuid }}&return_timeout=120"

Check failure on line 120 in ansible/cluster_setup.yml

View workflow job for this annotation

GitHub Actions / Ansible — syntax & lint

yaml[line-length] 

Line too long (166 > 160 characters)
method: GET
url_username: "{{ ontap_username }}"
url_password: "{{ ontap_password }}"
Expand Down Expand Up @@ -194,7 +194,7 @@
# -- Step 5: Poll job until complete --------------------------------
- name: "Poll cluster-create job until complete"
ansible.builtin.uri:
url: "{{ api_url_base }}/cluster/jobs/{{ create_cluster.json.job.uuid }}?fields=code,description,end_time,error,_links,message,start_time,state,svm,uuid,arguments&return_timeout=120"

Check failure on line 197 in ansible/cluster_setup.yml

View workflow job for this annotation

GitHub Actions / Ansible — syntax & lint

yaml[line-length] 

Line too long (190 > 160 characters)
method: GET
url_username: "{{ ontap_username }}"
url_password: "{{ cluster_pass }}"
Expand Down
43 changes: 8 additions & 35 deletions python/cluster_setup_basic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
#!/usr/bin/env python3
# © 2026 NetApp, Inc. All Rights Reserved.
# SPDX-License-Identifier: Apache-2.0
# See the NOTICE file in the repo root for trademark and attribution details.

"""Create a storage cluster from two pre-cluster nodes.

Equivalent to: orchestrio run yaml-workflows/workflows/cluster_setup_basic.yaml
"""Create a storage cluster from two pre-cluster nodes (ONTAP 9 unified).

Steps:
1. discover_nodes — GET /api/cluster/nodes (membership=available, retry 3x/30s)
Expand Down Expand Up @@ -59,23 +56,11 @@
}
# ---------------------------------------------------------------------------

_NODE_FIELDS_SETS = [
# newest (9.19+)
(
"name,model,state,ha,version,serial_number,membership,"
"cluster_interfaces,management_interfaces,metrocluster,disaggregated,san_optimized"
),
# 9.18 without disaggregated
(
"name,model,state,ha,version,serial_number,membership,"
"cluster_interfaces,management_interfaces,metrocluster,san_optimized"
),
# 9.14 and older — minimal safe set
(
"name,model,state,ha,version,serial_number,membership,"
"cluster_interfaces,management_interfaces,metrocluster"
),
]
# ONTAP 9 unified — node discovery fields
_NODE_FIELDS = (
"name,model,state,ha,version,serial_number,membership,"
"cluster_interfaces,management_interfaces,metrocluster"
)


def _env(key: str, required: bool = True) -> str:
Expand All @@ -96,20 +81,8 @@ def _env(key: str, required: bool = True) -> str:


def _get_nodes(client: OntapClient, **kwargs) -> dict:
"""GET /cluster/nodes, trying progressively reduced field sets for older ONTAP versions."""
last_exc: Exception | None = None
for fields in _NODE_FIELDS_SETS:
try:
return client.get("/cluster/nodes", fields=fields, **kwargs)
except Exception as exc:
if "262197" in str(exc):
logger.warning(
"discover: field unsupported on this version, retrying with reduced fields"
)
last_exc = exc
continue
raise
raise last_exc # type: ignore[misc]
"""GET /cluster/nodes with the standard ONTAP 9 unified field set."""
return client.get("/cluster/nodes", fields=_NODE_FIELDS, **kwargs)


def discover_nodes(client: OntapClient, attempts: int = 3, delay: int = 30) -> dict:
Expand Down
Loading