diff --git a/.github/workflows/validate-config.yml b/.github/workflows/validate-config.yml new file mode 100644 index 0000000..6271056 --- /dev/null +++ b/.github/workflows/validate-config.yml @@ -0,0 +1,72 @@ +# ============================================================================= +# validate-config.yml — Validate config files against schema +# ============================================================================= +# Triggered on PRs and pushes that touch config/ or this workflow. +# Validates YAML syntax and JSON Schema compliance. +# ============================================================================= + +name: Validate Configuration + +on: + push: + branches: [main] + paths: + - 'config/**' + - '.github/workflows/validate-config.yml' + pull_request: + branches: [main] + paths: + - 'config/**' + workflow_dispatch: + +permissions: + contents: read + +jobs: + validate: + runs-on: ubuntu-latest + + steps: + - name: Checkout repository + uses: actions/checkout@v4 + + - name: Setup Python + uses: actions/setup-python@v5 + with: + python-version: '3.12' + + - name: Install dependencies + run: pip install pyyaml jsonschema + + - name: Validate infrastructure.yml against schema + run: | + python3 -c " + import yaml, json, sys + from jsonschema import validate, ValidationError + + with open('config/infrastructure.yml') as f: + data = yaml.safe_load(f) + + with open('config/schema/variables.schema.json') as f: + schema = json.load(f) + + try: + validate(instance=data, schema=schema) + print('✅ config/infrastructure.yml passes schema validation') + except ValidationError as e: + print(f'❌ Schema validation failed: {e.message}') + print(f' Path: {\" > \".join(str(p) for p in e.absolute_path)}') + sys.exit(1) + " + + - name: Validate variables.example.yml syntax + run: | + python3 -c " + import yaml, sys + with open('config/variables.example.yml') as f: + data = yaml.safe_load(f) + if data is None: + print('❌ variables.example.yml is empty') + sys.exit(1) + print('✅ config/variables.example.yml is valid YAML') + " diff --git a/.gitignore b/.gitignore index 5ddfa1c..16c964e 100644 --- a/.gitignore +++ b/.gitignore @@ -34,9 +34,10 @@ ansible/.vault_pass !.env.example # Central config (actual values — never commit) -configs/infrastructure-*.yml -!configs/infrastructure.yml -configs/credentials/ +config/infrastructure-*.yml +!config/infrastructure.yml +config/variables.yml +config/credentials/ # Log files (keep the directory via .gitkeep) logs/** diff --git a/README.md b/README.md index 262a79a..9b9a482 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ Platform automation toolkit for **Azure Local** — deployment scripts, validati | Directory | Description | |-----------|-------------| | **[scripts/](https://github.com/AzureLocal/azurelocal-toolkit/tree/main/scripts)** | 200+ PowerShell scripts organized by deployment stage (02–08), plus common modules, validation, handover, lifecycle, and tools | -| **[configs/](https://github.com/AzureLocal/azurelocal-toolkit/tree/main/configs)** | Master infrastructure config template, ARM templates, and variable registry | +| **[config/](https://github.com/AzureLocal/azurelocal-toolkit/tree/main/configs)** | Master infrastructure config template, ARM templates, and variable registry | | **[tools/](https://github.com/AzureLocal/azurelocal-toolkit/tree/main/tools)** | Planning utilities (S2D capacity calculator) | | **[tests/](https://github.com/AzureLocal/azurelocal-toolkit/tree/main/tests)** | Test infrastructure (future Pester suites) | @@ -34,8 +34,8 @@ The toolkit follows a structured deployment lifecycle: The toolkit uses a config-driven approach: -- **`configs/infrastructure.yml`** — Master configuration template with 14 sections covering Azure tenant, networking, compute, storage, security, and more -- **`configs/variables.template.yml`** — Azure Local-specific variables for deployment +- **`config/infrastructure.yml`** — Master configuration template with 14 sections covering Azure tenant, networking, compute, storage, security, and more +- **`config/variables.example.yml`** — Azure Local-specific variables for deployment ## Related Repositories diff --git a/configs/Generate-AzureLocal-Parameters.ps1 b/config/Generate-AzureLocal-Parameters.ps1 similarity index 98% rename from configs/Generate-AzureLocal-Parameters.ps1 rename to config/Generate-AzureLocal-Parameters.ps1 index 07a8ae4..f9dcab5 100644 --- a/configs/Generate-AzureLocal-Parameters.ps1 +++ b/config/Generate-AzureLocal-Parameters.ps1 @@ -20,7 +20,7 @@ - storageNetworkList (from network_intents with storage_networks) .PARAMETER ConfigPath - Path to the infrastructure YAML file. Defaults to configs/infrastructure.yml + Path to the infrastructure YAML file. Defaults to config/infrastructure.yml relative to the repository root. .PARAMETER AuthType @@ -35,11 +35,11 @@ Show what would be generated without writing the file. .EXAMPLE - .\Generate-AzureLocal-Parameters.ps1 -ConfigPath "configs/infrastructure-azl-demo.yml" -AuthType AD + .\Generate-AzureLocal-Parameters.ps1 -ConfigPath "config/infrastructure-azl-demo.yml" -AuthType AD Generates AD parameters file from the azl-demo config. .EXAMPLE - .\Generate-AzureLocal-Parameters.ps1 -ConfigPath "configs/infrastructure-azl-lab.yml" -AuthType LocalIdentity -WhatIf + .\Generate-AzureLocal-Parameters.ps1 -ConfigPath "config/infrastructure-azl-lab.yml" -AuthType LocalIdentity -WhatIf Shows what would be generated for local identity without writing a file. #> diff --git a/configs/azure/.gitkeep b/config/azure/.gitkeep similarity index 100% rename from configs/azure/.gitkeep rename to config/azure/.gitkeep diff --git a/configs/azure/arm-templates/README.md b/config/azure/arm-templates/README.md similarity index 96% rename from configs/azure/arm-templates/README.md rename to config/azure/arm-templates/README.md index b3c5325..5fb6a20 100644 --- a/configs/azure/arm-templates/README.md +++ b/config/azure/arm-templates/README.md @@ -43,13 +43,13 @@ Use the config-driven generation script to populate parameters from `infrastruct ```powershell # Generate AD parameter file -.\configs\Generate-AzureLocal-Parameters.ps1 -ConfigPath "configs/infrastructure.yml" -AuthType AD +.\configs\Generate-AzureLocal-Parameters.ps1 -ConfigPath "config/infrastructure.yml" -AuthType AD # Generate Local Identity parameter file -.\configs\Generate-AzureLocal-Parameters.ps1 -ConfigPath "configs/infrastructure.yml" -AuthType LocalIdentity +.\configs\Generate-AzureLocal-Parameters.ps1 -ConfigPath "config/infrastructure.yml" -AuthType LocalIdentity ``` -The script reads all 54 parameters from `infrastructure.yml`, resolves Key Vault references, and writes a deployment-ready JSON file. See `configs/Generate-AzureLocal-Parameters.ps1` for full documentation. +The script reads all 54 parameters from `infrastructure.yml`, resolves Key Vault references, and writes a deployment-ready JSON file. See `config/Generate-AzureLocal-Parameters.ps1` for full documentation. ### Option 2: Manual Placeholder Replacement diff --git a/configs/azure/arm-templates/cluster-deployment/README.md b/config/azure/arm-templates/cluster-deployment/README.md similarity index 94% rename from configs/azure/arm-templates/cluster-deployment/README.md rename to config/azure/arm-templates/cluster-deployment/README.md index 5c90b4b..a39eff5 100644 --- a/configs/azure/arm-templates/cluster-deployment/README.md +++ b/config/azure/arm-templates/cluster-deployment/README.md @@ -30,13 +30,13 @@ Use the generation script to populate all 54 parameters from `infrastructure.yml ```powershell # AD auth -.\configs\Generate-AzureLocal-Parameters.ps1 -ConfigPath "configs/infrastructure.yml" -AuthType AD +.\configs\Generate-AzureLocal-Parameters.ps1 -ConfigPath "config/infrastructure.yml" -AuthType AD # Local Identity auth -.\configs\Generate-AzureLocal-Parameters.ps1 -ConfigPath "configs/infrastructure.yml" -AuthType LocalIdentity +.\configs\Generate-AzureLocal-Parameters.ps1 -ConfigPath "config/infrastructure.yml" -AuthType LocalIdentity ``` -The script reads the YAML config, maps all values, and writes a deployment-ready JSON. See `configs/Generate-AzureLocal-Parameters.ps1` for full documentation. +The script reads the YAML config, maps all values, and writes a deployment-ready JSON. See `config/Generate-AzureLocal-Parameters.ps1` for full documentation. ### Option B: Manual Replacement @@ -101,10 +101,10 @@ Key differences: Instead of manually filling placeholders, use the generation script: ```powershell -.\configs\Generate-AzureLocal-Parameters.ps1 -ConfigPath "configs/infrastructure.yml" -AuthType AD +.\configs\Generate-AzureLocal-Parameters.ps1 -ConfigPath "config/infrastructure.yml" -AuthType AD ``` -See `configs/Generate-AzureLocal-Parameters.ps1` for full documentation. +See `config/Generate-AzureLocal-Parameters.ps1` for full documentation. ## Validated Examples diff --git a/configs/azure/arm-templates/cluster-deployment/azuredeploy.json b/config/azure/arm-templates/cluster-deployment/azuredeploy.json similarity index 100% rename from configs/azure/arm-templates/cluster-deployment/azuredeploy.json rename to config/azure/arm-templates/cluster-deployment/azuredeploy.json diff --git a/configs/azure/arm-templates/cluster-deployment/azuredeploy.parameters.ad.json b/config/azure/arm-templates/cluster-deployment/azuredeploy.parameters.ad.json similarity index 100% rename from configs/azure/arm-templates/cluster-deployment/azuredeploy.parameters.ad.json rename to config/azure/arm-templates/cluster-deployment/azuredeploy.parameters.ad.json diff --git a/configs/azure/arm-templates/cluster-deployment/azuredeploy.parameters.json b/config/azure/arm-templates/cluster-deployment/azuredeploy.parameters.json similarity index 100% rename from configs/azure/arm-templates/cluster-deployment/azuredeploy.parameters.json rename to config/azure/arm-templates/cluster-deployment/azuredeploy.parameters.json diff --git a/configs/azure/arm-templates/cluster-deployment/azuredeploy.parameters.local-identity.json b/config/azure/arm-templates/cluster-deployment/azuredeploy.parameters.local-identity.json similarity index 100% rename from configs/azure/arm-templates/cluster-deployment/azuredeploy.parameters.local-identity.json rename to config/azure/arm-templates/cluster-deployment/azuredeploy.parameters.local-identity.json diff --git a/configs/azure/arm-templates/examples/README.md b/config/azure/arm-templates/examples/README.md similarity index 100% rename from configs/azure/arm-templates/examples/README.md rename to config/azure/arm-templates/examples/README.md diff --git a/configs/azure/arm-templates/examples/single-intent-converged/README.md b/config/azure/arm-templates/examples/single-intent-converged/README.md similarity index 100% rename from configs/azure/arm-templates/examples/single-intent-converged/README.md rename to config/azure/arm-templates/examples/single-intent-converged/README.md diff --git a/configs/azure/arm-templates/examples/single-intent-converged/azuredeploy.parameters.ad.json b/config/azure/arm-templates/examples/single-intent-converged/azuredeploy.parameters.ad.json similarity index 100% rename from configs/azure/arm-templates/examples/single-intent-converged/azuredeploy.parameters.ad.json rename to config/azure/arm-templates/examples/single-intent-converged/azuredeploy.parameters.ad.json diff --git a/configs/azure/arm-templates/examples/single-intent-converged/azuredeploy.parameters.local-identity.json b/config/azure/arm-templates/examples/single-intent-converged/azuredeploy.parameters.local-identity.json similarity index 100% rename from configs/azure/arm-templates/examples/single-intent-converged/azuredeploy.parameters.local-identity.json rename to config/azure/arm-templates/examples/single-intent-converged/azuredeploy.parameters.local-identity.json diff --git a/configs/azure/arm-templates/examples/three-intent-separated/README.md b/config/azure/arm-templates/examples/three-intent-separated/README.md similarity index 100% rename from configs/azure/arm-templates/examples/three-intent-separated/README.md rename to config/azure/arm-templates/examples/three-intent-separated/README.md diff --git a/configs/azure/arm-templates/examples/three-intent-separated/azuredeploy.parameters.ad.json b/config/azure/arm-templates/examples/three-intent-separated/azuredeploy.parameters.ad.json similarity index 100% rename from configs/azure/arm-templates/examples/three-intent-separated/azuredeploy.parameters.ad.json rename to config/azure/arm-templates/examples/three-intent-separated/azuredeploy.parameters.ad.json diff --git a/configs/azure/arm-templates/examples/three-intent-separated/azuredeploy.parameters.local-identity.json b/config/azure/arm-templates/examples/three-intent-separated/azuredeploy.parameters.local-identity.json similarity index 100% rename from configs/azure/arm-templates/examples/three-intent-separated/azuredeploy.parameters.local-identity.json rename to config/azure/arm-templates/examples/three-intent-separated/azuredeploy.parameters.local-identity.json diff --git a/configs/azure/arm-templates/examples/two-intent-standard/README.md b/config/azure/arm-templates/examples/two-intent-standard/README.md similarity index 100% rename from configs/azure/arm-templates/examples/two-intent-standard/README.md rename to config/azure/arm-templates/examples/two-intent-standard/README.md diff --git a/configs/azure/arm-templates/examples/two-intent-standard/azuredeploy.parameters.ad.json b/config/azure/arm-templates/examples/two-intent-standard/azuredeploy.parameters.ad.json similarity index 100% rename from configs/azure/arm-templates/examples/two-intent-standard/azuredeploy.parameters.ad.json rename to config/azure/arm-templates/examples/two-intent-standard/azuredeploy.parameters.ad.json diff --git a/configs/azure/arm-templates/examples/two-intent-standard/azuredeploy.parameters.local-identity.json b/config/azure/arm-templates/examples/two-intent-standard/azuredeploy.parameters.local-identity.json similarity index 100% rename from configs/azure/arm-templates/examples/two-intent-standard/azuredeploy.parameters.local-identity.json rename to config/azure/arm-templates/examples/two-intent-standard/azuredeploy.parameters.local-identity.json diff --git a/configs/infrastructure.yml b/config/infrastructure.yml similarity index 100% rename from configs/infrastructure.yml rename to config/infrastructure.yml diff --git a/configs/variables/assets/master-registry.yaml b/config/schema/master-registry.yaml similarity index 99% rename from configs/variables/assets/master-registry.yaml rename to config/schema/master-registry.yaml index 1ce5518..7bd7146 100644 --- a/configs/variables/assets/master-registry.yaml +++ b/config/schema/master-registry.yaml @@ -2,7 +2,7 @@ # Master Variable Registry - Azure Local Cloudnology Cloud Management Platform # ============================================================================= # Version: 4.0.0 -# Schema: infrastructure.schema.json (v4.0.0) +# Schema: variables.schema.json (v4.0.0) # Last Updated: 2026-03-05 # # This file defines ALL variable names, types, and descriptions used across @@ -83,7 +83,7 @@ _metadata: change: "Added B2B, GitLab, Arc Resource Bridge, cluster networking, monitoring extended" reason: "Variable audit from 157 PowerShell scripts" cross_references: - - source: "infrastructure.schema.json" + - source: "variables.schema.json" relationship: "validates infrastructure files against these definitions" - source: "registry-reference.mdx" relationship: "human-readable documentation of this registry" diff --git a/configs/variables/assets/infrastructure.schema.json b/config/schema/variables.schema.json similarity index 99% rename from configs/variables/assets/infrastructure.schema.json rename to config/schema/variables.schema.json index acec3db..0027ff3 100644 --- a/configs/variables/assets/infrastructure.schema.json +++ b/config/schema/variables.schema.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schema.org/draft-07/schema#", - "$id": "https://github.com/Azure Local Cloud/azl-env/schemas/infrastructure.schema.json", + "$id": "https://github.com/Azure Local Cloud/azl-env/schemas/variables.schema.json", "title": "Azure Local Infrastructure Configuration (v4.0.0)", "description": "JSON Schema for validating Azure Local environment infrastructure.yml files. Aligned with master-registry.yaml v4.0.0 — 13-section hierarchy. NOTE: This schema is currently hand-maintained and MUST be kept in sync with master-registry.yaml (the canonical source). TODO: Auto-generate this schema from master-registry.yaml to prevent drift.", "type": "object", diff --git a/configs/variables.template.yml b/config/variables.example.yml similarity index 77% rename from configs/variables.template.yml rename to config/variables.example.yml index f5c8fe5..4b01f0c 100644 --- a/configs/variables.template.yml +++ b/config/variables.example.yml @@ -1,16 +1,21 @@ -################################################################################ -# Azure Local Toolkit - Variables Template +# ============================================================================= +# variables.example.yml +# Central configuration — single source of truth for all deployment phases. # -# Copy this file to your own variables.yml and fill in your environment values. -# This template contains the minimum required variables for a deployment. +# Copy this file to variables.yml and fill in your values: +# cp config/variables.example.yml config/variables.yml # -# For the full variable reference, see: -# - configs/infrastructure.yml (complete 14-section schema) -# - configs/variables/assets/master-registry.yaml (variable definitions) +# DO NOT commit variables.yml — it is excluded by .gitignore. +# +# Key Vault References: +# Secrets use keyvault:// URIs and are resolved at runtime. +# Format: keyvault:/// +# NEVER put actual passwords or secrets in this file. # -# All secrets should be stored in Azure Key Vault and referenced as: -# keyvault:/// -################################################################################ +# For the full variable reference, see: +# - config/infrastructure.yml (complete 14-section schema) +# - config/schema/master-registry.yaml (variable definitions) +# ============================================================================= # ============================================================================= # SITE diff --git a/configs/variables/.gitkeep b/config/variables/.gitkeep similarity index 100% rename from configs/variables/.gitkeep rename to config/variables/.gitkeep diff --git a/config/variables/readme.md b/config/variables/readme.md new file mode 100644 index 0000000..8b96761 --- /dev/null +++ b/config/variables/readme.md @@ -0,0 +1,32 @@ +# Variables + +This directory provides supplementary variable information for the Azure Local Toolkit. + +## Config Structure + +``` +config/ +├── infrastructure.yml # Full 14-section config (platform deployments) +├── variables.example.yml # Copyable template with IIC example values +├── variables.yml # Your actual config (gitignored) +├── schema/ +│ ├── master-registry.yaml # Complete variable definitions with types/defaults +│ └── variables.schema.json # JSON Schema for validation +└── variables/ + └── readme.md # This file +``` + +## Quick Start + +```bash +cp config/variables.example.yml config/variables.yml +# Edit config/variables.yml with your environment values +``` + +## References + +- `config/variables.example.yml` — minimal starting template (IIC fictional data) +- `config/infrastructure.yml` — full 14-section configuration reference +- `config/schema/master-registry.yaml` — authoritative variable definitions +- `config/schema/variables.schema.json` — JSON Schema for CI validation + diff --git a/configs/variables/readme.md b/configs/variables/readme.md deleted file mode 100644 index 6b99dd8..0000000 --- a/configs/variables/readme.md +++ /dev/null @@ -1,14 +0,0 @@ -# Variable Assets - -This directory contains the variable registry and schema for the Azure Local Toolkit. - -## Files - -- **master-registry.yaml** — Complete variable definitions with types, defaults, and examples -- **infrastructure.schema.json** — JSON Schema for validating infrastructure.yml - -## Usage - -See `configs/variables.template.yml` for a minimal starting template. -See `configs/infrastructure.yml` for the full 14-section configuration reference. - diff --git a/docs/configuration/variables.md b/docs/configuration/variables.md index 63e041b..f9105d7 100644 --- a/docs/configuration/variables.md +++ b/docs/configuration/variables.md @@ -16,8 +16,8 @@ Master configuration template with 14 sections covering the full Azure Local dep - Active Directory - And more... -This file serves as a **metadata and schema registry**. Copy `variables.template.yml` for your deployment-specific values. +This file serves as a **metadata and schema registry**. Copy `variables.example.yml` for your deployment-specific values. -## variables.template.yml +## variables.example.yml Azure Local-specific variables extracted from the master config. Copy this file to `variables.yml` (gitignored) and fill in your environment values. diff --git a/docs/index.md b/docs/index.md index 5a685d8..bd25534 100644 --- a/docs/index.md +++ b/docs/index.md @@ -12,7 +12,7 @@ Platform automation toolkit for **Azure Local** — deployment scripts, validati | Directory | Description | |-----------|-------------| | **scripts/** | 200+ PowerShell scripts organized by deployment stage (02–08), plus common modules, validation, handover, lifecycle, and tools | -| **configs/** | Master infrastructure config template, ARM templates, and variable registry | +| **config/** | Master infrastructure config template, ARM templates, and variable registry | | **tools/** | Planning utilities (S2D capacity calculator) | | **tests/** | Test infrastructure (future Pester suites) | @@ -35,7 +35,7 @@ Platform automation toolkit for **Azure Local** — deployment scripts, validati ## Getting Started 1. Clone the repository -2. Copy `configs/variables.template.yml` to `configs/variables.yml` +2. Copy `config/variables.example.yml` to `config/variables.yml` 3. Fill in your environment-specific values 4. Follow the deployment stage guides in order (02 → 08) diff --git a/scripts/common/idrac-management/Enable-IdracVnc.ps1 b/scripts/common/idrac-management/Enable-IdracVnc.ps1 index 94137cd..c7d7ea2 100644 --- a/scripts/common/idrac-management/Enable-IdracVnc.ps1 +++ b/scripts/common/idrac-management/Enable-IdracVnc.ps1 @@ -66,15 +66,15 @@ Ignore SSL certificate validation errors (useful for self-signed iDRAC certificates). .EXAMPLE - .\Enable-IdracVnc.ps1 -ConfigPath "configs/infrastructure.yml" + .\Enable-IdracVnc.ps1 -ConfigPath "config/infrastructure.yml" Config-driven: enables VNC on all nodes using YAML settings and Key Vault credentials. .EXAMPLE - .\Enable-IdracVnc.ps1 -ConfigPath "configs/infrastructure.yml" -TargetNode "node-01" + .\Enable-IdracVnc.ps1 -ConfigPath "config/infrastructure.yml" -TargetNode "node-01" Config-driven: targets only a specific node. .EXAMPLE - .\Enable-IdracVnc.ps1 -ConfigPath "configs/infrastructure.yml" -WhatIf + .\Enable-IdracVnc.ps1 -ConfigPath "config/infrastructure.yml" -WhatIf Config-driven dry run: shows what would be configured without making changes. .EXAMPLE diff --git a/scripts/common/idrac-management/README.md b/scripts/common/idrac-management/README.md index 3487ce7..4090a80 100644 --- a/scripts/common/idrac-management/README.md +++ b/scripts/common/idrac-management/README.md @@ -42,20 +42,20 @@ Enables and configures VNC access on Dell iDRAC via Redfish API. ```powershell # Enable VNC on all nodes using infrastructure.yml settings -.\Enable-IdracVnc.ps1 -ConfigPath "configs/infrastructure.yml" -IgnoreCertificateErrors +.\Enable-IdracVnc.ps1 -ConfigPath "config/infrastructure.yml" -IgnoreCertificateErrors # Target a single node -.\Enable-IdracVnc.ps1 -ConfigPath "configs/infrastructure.yml" -TargetNode "node-01" +.\Enable-IdracVnc.ps1 -ConfigPath "config/infrastructure.yml" -TargetNode "node-01" # Dry run — show what would change without applying -.\Enable-IdracVnc.ps1 -ConfigPath "configs/infrastructure.yml" -WhatIf +.\Enable-IdracVnc.ps1 -ConfigPath "config/infrastructure.yml" -WhatIf # Override VNC port from config default -.\Enable-IdracVnc.ps1 -ConfigPath "configs/infrastructure.yml" -VNCPort 5902 +.\Enable-IdracVnc.ps1 -ConfigPath "config/infrastructure.yml" -VNCPort 5902 # Provide credentials explicitly (skips Key Vault resolution) $cred = Get-Credential -UserName "idrac_admin" -.\Enable-IdracVnc.ps1 -ConfigPath "configs/infrastructure.yml" -Credential $cred +.\Enable-IdracVnc.ps1 -ConfigPath "config/infrastructure.yml" -Credential $cred ``` **Usage — Standalone mode:** diff --git a/scripts/common/utilities/helpers/Connect-AzureCliSession.ps1 b/scripts/common/utilities/helpers/Connect-AzureCliSession.ps1 index f3ddfbe..255344f 100644 --- a/scripts/common/utilities/helpers/Connect-AzureCliSession.ps1 +++ b/scripts/common/utilities/helpers/Connect-AzureCliSession.ps1 @@ -41,7 +41,7 @@ .EXAMPLE # Read values from infrastructure.yml - .\Connect-AzureCliSession.ps1 -ConfigPath "../../configs/infrastructure.yml" + .\Connect-AzureCliSession.ps1 -ConfigPath "../../config/infrastructure.yml" .NOTES File Name : Connect-AzureCliSession.ps1 diff --git a/scripts/common/utilities/helpers/Connect-AzureSession.ps1 b/scripts/common/utilities/helpers/Connect-AzureSession.ps1 index 9cb3780..3884144 100644 --- a/scripts/common/utilities/helpers/Connect-AzureSession.ps1 +++ b/scripts/common/utilities/helpers/Connect-AzureSession.ps1 @@ -45,7 +45,7 @@ .EXAMPLE # Read values from infrastructure.yml - .\Connect-AzureSession.ps1 -ConfigPath "../../configs/infrastructure.yml" + .\Connect-AzureSession.ps1 -ConfigPath "../../config/infrastructure.yml" .NOTES File Name : Connect-AzureSession.ps1 diff --git a/scripts/common/utilities/helpers/config-loader.ps1 b/scripts/common/utilities/helpers/config-loader.ps1 index 8e25386..5b96b90 100644 --- a/scripts/common/utilities/helpers/config-loader.ps1 +++ b/scripts/common/utilities/helpers/config-loader.ps1 @@ -538,13 +538,13 @@ function Get-AvailableSolutions { .DESCRIPTION Primary function for deployment scripts to load configuration. - Loads configs/infrastructure.yml from the repository root. + Loads config/infrastructure.yml from the repository root. This is the simplified loader for scripts that need direct access to infrastructure configuration without solution-based merging. .PARAMETER ConfigPath - Optional. Path to infrastructure.yml. Defaults to configs/infrastructure.yml + Optional. Path to infrastructure.yml. Defaults to config/infrastructure.yml in the repository root. .EXAMPLE @@ -563,7 +563,7 @@ function Get-InfrastructureConfig { [string]$ConfigPath ) - # Default to configs/infrastructure.yml in repo root + # Default to config/infrastructure.yml in repo root if (-not $ConfigPath) { $ConfigPath = Join-Path $script:RepoRoot "configs\infrastructure.yml" } diff --git a/scripts/deploy/02-azure-foundation/phase-02-resource-providers/task-01-register-resource-providers/powershell/Register-ResourceProviders.ps1 b/scripts/deploy/02-azure-foundation/phase-02-resource-providers/task-01-register-resource-providers/powershell/Register-ResourceProviders.ps1 index 9ed64ca..17c5ef3 100644 --- a/scripts/deploy/02-azure-foundation/phase-02-resource-providers/task-01-register-resource-providers/powershell/Register-ResourceProviders.ps1 +++ b/scripts/deploy/02-azure-foundation/phase-02-resource-providers/task-01-register-resource-providers/powershell/Register-ResourceProviders.ps1 @@ -14,7 +14,7 @@ .PARAMETER ConfigFile Path to the infrastructure.yml configuration file. - Defaults to configs/infrastructure.yml in the repository root. + Defaults to config/infrastructure.yml in the repository root. .PARAMETER WaitForRegistration If specified, waits for all provider registrations to complete. diff --git a/scripts/deploy/02-azure-foundation/phase-03-rbac-permissions/powershell/Set-RbacRoleAssignments.ps1 b/scripts/deploy/02-azure-foundation/phase-03-rbac-permissions/powershell/Set-RbacRoleAssignments.ps1 index 1813b42..8750e7b 100644 --- a/scripts/deploy/02-azure-foundation/phase-03-rbac-permissions/powershell/Set-RbacRoleAssignments.ps1 +++ b/scripts/deploy/02-azure-foundation/phase-03-rbac-permissions/powershell/Set-RbacRoleAssignments.ps1 @@ -6,7 +6,7 @@ Loads config from infrastructure.yml, assigns roles at subscription/resource group scope, supports WhatIf and verification mode. .PARAMETER ConfigPath - Path to infrastructure.yml config file. Defaults to configs/infrastructure.yml in the repository root. + Path to infrastructure.yml config file. Defaults to config/infrastructure.yml in the repository root. .PARAMETER ServicePrincipalDisplayName Display name of the deployment service principal. @@ -22,13 +22,13 @@ If specified, only verifies assignments (no changes). .EXAMPLE - .\Set-RbacRoleAssignments.ps1 -ConfigPath "configs/infrastructure.yml" -ServicePrincipalDisplayName "sp-azurelocal-deploy" -WhatIf + .\Set-RbacRoleAssignments.ps1 -ConfigPath "config/infrastructure.yml" -ServicePrincipalDisplayName "sp-azurelocal-deploy" -WhatIf .EXAMPLE - .\Set-RbacRoleAssignments.ps1 -ConfigPath "configs/infrastructure.yml" -UserPrincipalName "deployment-user@yourdomain.com" -VerifyOnly + .\Set-RbacRoleAssignments.ps1 -ConfigPath "config/infrastructure.yml" -UserPrincipalName "deployment-user@yourdomain.com" -VerifyOnly .EXAMPLE - .\Set-RbacRoleAssignments.ps1 -ConfigPath "configs/infrastructure.yml" -ObjectId "55555555-5555-5555-5555-555555555555" + .\Set-RbacRoleAssignments.ps1 -ConfigPath "config/infrastructure.yml" -ObjectId "55555555-5555-5555-5555-555555555555" .NOTES Requires: Az.Accounts, Az.Resources, powershell-yaml modules @@ -40,7 +40,7 @@ param( [Parameter(Mandatory = $false)] [ValidateScript({Test-Path $_})] - [string]$ConfigPath = "configs/infrastructure.yml", + [string]$ConfigPath = "config/infrastructure.yml", [Parameter(Mandatory = $false)] [string]$ServicePrincipalDisplayName, diff --git a/scripts/deploy/02-azure-foundation/phase-03-rbac-permissions/powershell/Test-RbacRoleAssignments.ps1 b/scripts/deploy/02-azure-foundation/phase-03-rbac-permissions/powershell/Test-RbacRoleAssignments.ps1 index e61112f..c0805db 100644 --- a/scripts/deploy/02-azure-foundation/phase-03-rbac-permissions/powershell/Test-RbacRoleAssignments.ps1 +++ b/scripts/deploy/02-azure-foundation/phase-03-rbac-permissions/powershell/Test-RbacRoleAssignments.ps1 @@ -6,7 +6,7 @@ Loads config from infrastructure.yml, validates role assignments at subscription and resource group scope. .PARAMETER ConfigPath - Path to infrastructure.yml config file. Defaults to configs/infrastructure.yml in the repository root. + Path to infrastructure.yml config file. Defaults to config/infrastructure.yml in the repository root. .PARAMETER ServicePrincipalDisplayName Display name of the deployment service principal to validate. @@ -18,13 +18,13 @@ Entra ID Object ID of the principal to validate (optional). .EXAMPLE - .\Validate-RbacRoleAssignments.ps1 -ConfigPath "configs/infrastructure.yml" -ServicePrincipalDisplayName "sp-azurelocal-deploy" + .\Validate-RbacRoleAssignments.ps1 -ConfigPath "config/infrastructure.yml" -ServicePrincipalDisplayName "sp-azurelocal-deploy" .EXAMPLE - .\Validate-RbacRoleAssignments.ps1 -ConfigPath "configs/infrastructure.yml" -UserPrincipalName "deployment-user@yourdomain.com" + .\Validate-RbacRoleAssignments.ps1 -ConfigPath "config/infrastructure.yml" -UserPrincipalName "deployment-user@yourdomain.com" .EXAMPLE - .\Validate-RbacRoleAssignments.ps1 -ConfigPath "configs/infrastructure.yml" -ObjectId "55555555-5555-5555-5555-555555555555" + .\Validate-RbacRoleAssignments.ps1 -ConfigPath "config/infrastructure.yml" -ObjectId "55555555-5555-5555-5555-555555555555" .NOTES Requires: Az.Accounts, Az.Resources, powershell-yaml modules @@ -36,7 +36,7 @@ param( [Parameter(Mandatory = $false)] [ValidateScript({Test-Path $_})] - [string]$ConfigPath = "configs/infrastructure.yml", + [string]$ConfigPath = "config/infrastructure.yml", [Parameter(Mandatory = $false)] [string]$ServicePrincipalDisplayName, diff --git a/scripts/deploy/02-azure-foundation/phase-04-azure-management-infrastructure/task-01-virtual-network/powershell/New-VirtualNetwork.ps1 b/scripts/deploy/02-azure-foundation/phase-04-azure-management-infrastructure/task-01-virtual-network/powershell/New-VirtualNetwork.ps1 index e9a5b81..97e3063 100644 --- a/scripts/deploy/02-azure-foundation/phase-04-azure-management-infrastructure/task-01-virtual-network/powershell/New-VirtualNetwork.ps1 +++ b/scripts/deploy/02-azure-foundation/phase-04-azure-management-infrastructure/task-01-virtual-network/powershell/New-VirtualNetwork.ps1 @@ -28,7 +28,7 @@ .\New-VirtualNetwork.ps1 -ResourceGroupName "rg-azlmgmt-prd-eus-01" -Location "eastus" .EXAMPLE - .\New-VirtualNetwork.ps1 -ConfigFile "configs/infrastructure.yml" + .\New-VirtualNetwork.ps1 -ConfigFile "config/infrastructure.yml" .NOTES Author: Azure Local Cloud AzureLocalCloud Team diff --git a/scripts/deploy/04-cluster-deployment/phase-01-hardware-provisioning/task-02-hardware-discovery-via-dell-redfish-api/powershell/Invoke-HardwareDiscovery.ps1 b/scripts/deploy/04-cluster-deployment/phase-01-hardware-provisioning/task-02-hardware-discovery-via-dell-redfish-api/powershell/Invoke-HardwareDiscovery.ps1 index 1435b39..2fcfd60 100644 --- a/scripts/deploy/04-cluster-deployment/phase-01-hardware-provisioning/task-02-hardware-discovery-via-dell-redfish-api/powershell/Invoke-HardwareDiscovery.ps1 +++ b/scripts/deploy/04-cluster-deployment/phase-01-hardware-provisioning/task-02-hardware-discovery-via-dell-redfish-api/powershell/Invoke-HardwareDiscovery.ps1 @@ -63,7 +63,7 @@ iDRAC ATTRIBUTES - Full dump of all iDRAC settings - Output JSON files saved to configs/network-devices/bmc/.json. + Output JSON files saved to config/network-devices/bmc/.json. Optionally calls Update-InfrastructureYml-FromDiscovery.ps1 on completion. CREDENTIAL RESOLUTION ORDER diff --git a/scripts/deploy/04-cluster-deployment/phase-03-os-configuration/task-12-complete-combined-script-all-steps/powershell/Invoke-Phase03OsConfiguration-Orchestrated.ps1 b/scripts/deploy/04-cluster-deployment/phase-03-os-configuration/task-12-complete-combined-script-all-steps/powershell/Invoke-Phase03OsConfiguration-Orchestrated.ps1 index 939d33e..824e51d 100644 --- a/scripts/deploy/04-cluster-deployment/phase-03-os-configuration/task-12-complete-combined-script-all-steps/powershell/Invoke-Phase03OsConfiguration-Orchestrated.ps1 +++ b/scripts/deploy/04-cluster-deployment/phase-03-os-configuration/task-12-complete-combined-script-all-steps/powershell/Invoke-Phase03OsConfiguration-Orchestrated.ps1 @@ -129,7 +129,7 @@ function Resolve-ConfigPath { if (Test-Path $r) { return $r } } catch {} } - # Attempt to find any infrastructure*.yml in a configs/ subdirectory + # Attempt to find any infrastructure*.yml in a config/ subdirectory foreach ($dir in @((Join-Path $PSScriptRoot "configs"), ".\configs")) { if (Test-Path $dir) { $found = @(Get-ChildItem -Path $dir -Filter "infrastructure*.yml" -File -ErrorAction SilentlyContinue) diff --git a/scripts/deploy/04-cluster-deployment/phase-05-cluster-deployment/active-directory/task-01-initiate-deployment-via-arm-template/powershell/Deploy-AzureLocalCluster.ps1 b/scripts/deploy/04-cluster-deployment/phase-05-cluster-deployment/active-directory/task-01-initiate-deployment-via-arm-template/powershell/Deploy-AzureLocalCluster.ps1 index 43d41e7..1b6c791 100644 --- a/scripts/deploy/04-cluster-deployment/phase-05-cluster-deployment/active-directory/task-01-initiate-deployment-via-arm-template/powershell/Deploy-AzureLocalCluster.ps1 +++ b/scripts/deploy/04-cluster-deployment/phase-05-cluster-deployment/active-directory/task-01-initiate-deployment-via-arm-template/powershell/Deploy-AzureLocalCluster.ps1 @@ -242,7 +242,7 @@ else { } if (-not $generatorScript) { - throw "Generate-AzureLocal-Parameters.ps1 not found. Pass -ParametersFile with a pre-built file, or ensure the generator is in configs/." + throw "Generate-AzureLocal-Parameters.ps1 not found. Pass -ParametersFile with a pre-built file, or ensure the generator is in config/." } Write-Log "Generator script: $generatorScript" diff --git a/scripts/deploy/04-cluster-deployment/phase-05-cluster-deployment/active-directory/task-02-verify-deployment-completion/powershell/Invoke-VerifyADDomainStatus-Orchestrated.ps1 b/scripts/deploy/04-cluster-deployment/phase-05-cluster-deployment/active-directory/task-02-verify-deployment-completion/powershell/Invoke-VerifyADDomainStatus-Orchestrated.ps1 index 38665d0..df29d20 100644 --- a/scripts/deploy/04-cluster-deployment/phase-05-cluster-deployment/active-directory/task-02-verify-deployment-completion/powershell/Invoke-VerifyADDomainStatus-Orchestrated.ps1 +++ b/scripts/deploy/04-cluster-deployment/phase-05-cluster-deployment/active-directory/task-02-verify-deployment-completion/powershell/Invoke-VerifyADDomainStatus-Orchestrated.ps1 @@ -9,7 +9,7 @@ mandatory contract (ConfigPath, Credential, TargetNode, WhatIf, LogPath). .PARAMETER ConfigPath - Path to the infrastructure YAML config (default: configs/infrastructure.yml). + Path to the infrastructure YAML config (default: config/infrastructure.yml). .PARAMETER Credential PSCredential for remote node access. Falls back to Key Vault → interactive prompt. @@ -27,7 +27,7 @@ .\Invoke-VerifyADDomainStatus-Orchestrated.ps1 .EXAMPLE - .\Invoke-VerifyADDomainStatus-Orchestrated.ps1 -ConfigPath "configs/infrastructure-azl-demo.yml" -WhatIf + .\Invoke-VerifyADDomainStatus-Orchestrated.ps1 -ConfigPath "config/infrastructure-azl-demo.yml" -WhatIf .NOTES Author: Azure Local Cloud AzureLocalCloud @@ -85,7 +85,7 @@ Write-Log "Log: $LogPath" # ── Config Loading ───────────────────────────────────────────────────── if (-not $ConfigPath) { - $candidates = @("configs/infrastructure.yml", "configs/infrastructure.yaml") + $candidates = @("config/infrastructure.yml", "config/infrastructure.yaml") foreach ($c in $candidates) { if (Test-Path $c) { $ConfigPath = $c; break } } diff --git a/scripts/deploy/04-cluster-deployment/phase-05-cluster-deployment/active-directory/task-02-verify-deployment-completion/powershell/Invoke-VerifyClusterHealth-Orchestrated.ps1 b/scripts/deploy/04-cluster-deployment/phase-05-cluster-deployment/active-directory/task-02-verify-deployment-completion/powershell/Invoke-VerifyClusterHealth-Orchestrated.ps1 index f099916..ef65bb8 100644 --- a/scripts/deploy/04-cluster-deployment/phase-05-cluster-deployment/active-directory/task-02-verify-deployment-completion/powershell/Invoke-VerifyClusterHealth-Orchestrated.ps1 +++ b/scripts/deploy/04-cluster-deployment/phase-05-cluster-deployment/active-directory/task-02-verify-deployment-completion/powershell/Invoke-VerifyClusterHealth-Orchestrated.ps1 @@ -14,7 +14,7 @@ 3. Interactive Get-Credential prompt .PARAMETER ConfigPath - Path to infrastructure.yml. Defaults to 'configs/infrastructure.yml' relative + Path to infrastructure.yml. Defaults to 'config/infrastructure.yml' relative to the working directory. .PARAMETER Credential @@ -38,9 +38,9 @@ Execution: Run from management server with access to infrastructure.yml .EXAMPLE - .\Invoke-VerifyClusterHealth-Orchestrated.ps1 -ConfigPath configs/infrastructure.yml - .\Invoke-VerifyClusterHealth-Orchestrated.ps1 -ConfigPath configs/infrastructure.yml -TargetNode iic-01-n01 - .\Invoke-VerifyClusterHealth-Orchestrated.ps1 -ConfigPath configs/infrastructure.yml -WhatIf + .\Invoke-VerifyClusterHealth-Orchestrated.ps1 -ConfigPath config/infrastructure.yml + .\Invoke-VerifyClusterHealth-Orchestrated.ps1 -ConfigPath config/infrastructure.yml -TargetNode iic-01-n01 + .\Invoke-VerifyClusterHealth-Orchestrated.ps1 -ConfigPath config/infrastructure.yml -WhatIf #> [CmdletBinding(SupportsShouldProcess)] diff --git a/scripts/deploy/04-cluster-deployment/phase-05-cluster-deployment/local-identity/task-01-initiate-deployment-via-arm-template/powershell/Deploy-AzureLocalCluster.ps1 b/scripts/deploy/04-cluster-deployment/phase-05-cluster-deployment/local-identity/task-01-initiate-deployment-via-arm-template/powershell/Deploy-AzureLocalCluster.ps1 index 43d41e7..1b6c791 100644 --- a/scripts/deploy/04-cluster-deployment/phase-05-cluster-deployment/local-identity/task-01-initiate-deployment-via-arm-template/powershell/Deploy-AzureLocalCluster.ps1 +++ b/scripts/deploy/04-cluster-deployment/phase-05-cluster-deployment/local-identity/task-01-initiate-deployment-via-arm-template/powershell/Deploy-AzureLocalCluster.ps1 @@ -242,7 +242,7 @@ else { } if (-not $generatorScript) { - throw "Generate-AzureLocal-Parameters.ps1 not found. Pass -ParametersFile with a pre-built file, or ensure the generator is in configs/." + throw "Generate-AzureLocal-Parameters.ps1 not found. Pass -ParametersFile with a pre-built file, or ensure the generator is in config/." } Write-Log "Generator script: $generatorScript" diff --git a/scripts/deploy/04-cluster-deployment/phase-05-cluster-deployment/local-identity/task-02-verify-deployment-completion/powershell/Invoke-VerifyClusterHealth-Orchestrated.ps1 b/scripts/deploy/04-cluster-deployment/phase-05-cluster-deployment/local-identity/task-02-verify-deployment-completion/powershell/Invoke-VerifyClusterHealth-Orchestrated.ps1 index f099916..ef65bb8 100644 --- a/scripts/deploy/04-cluster-deployment/phase-05-cluster-deployment/local-identity/task-02-verify-deployment-completion/powershell/Invoke-VerifyClusterHealth-Orchestrated.ps1 +++ b/scripts/deploy/04-cluster-deployment/phase-05-cluster-deployment/local-identity/task-02-verify-deployment-completion/powershell/Invoke-VerifyClusterHealth-Orchestrated.ps1 @@ -14,7 +14,7 @@ 3. Interactive Get-Credential prompt .PARAMETER ConfigPath - Path to infrastructure.yml. Defaults to 'configs/infrastructure.yml' relative + Path to infrastructure.yml. Defaults to 'config/infrastructure.yml' relative to the working directory. .PARAMETER Credential @@ -38,9 +38,9 @@ Execution: Run from management server with access to infrastructure.yml .EXAMPLE - .\Invoke-VerifyClusterHealth-Orchestrated.ps1 -ConfigPath configs/infrastructure.yml - .\Invoke-VerifyClusterHealth-Orchestrated.ps1 -ConfigPath configs/infrastructure.yml -TargetNode iic-01-n01 - .\Invoke-VerifyClusterHealth-Orchestrated.ps1 -ConfigPath configs/infrastructure.yml -WhatIf + .\Invoke-VerifyClusterHealth-Orchestrated.ps1 -ConfigPath config/infrastructure.yml + .\Invoke-VerifyClusterHealth-Orchestrated.ps1 -ConfigPath config/infrastructure.yml -TargetNode iic-01-n01 + .\Invoke-VerifyClusterHealth-Orchestrated.ps1 -ConfigPath config/infrastructure.yml -WhatIf #> [CmdletBinding(SupportsShouldProcess)] diff --git a/scripts/deploy/04-cluster-deployment/phase-05-cluster-deployment/local-identity/task-02-verify-deployment-completion/powershell/Invoke-VerifyLocalIdentityConfig-Orchestrated.ps1 b/scripts/deploy/04-cluster-deployment/phase-05-cluster-deployment/local-identity/task-02-verify-deployment-completion/powershell/Invoke-VerifyLocalIdentityConfig-Orchestrated.ps1 index 6e952c7..cfe011d 100644 --- a/scripts/deploy/04-cluster-deployment/phase-05-cluster-deployment/local-identity/task-02-verify-deployment-completion/powershell/Invoke-VerifyLocalIdentityConfig-Orchestrated.ps1 +++ b/scripts/deploy/04-cluster-deployment/phase-05-cluster-deployment/local-identity/task-02-verify-deployment-completion/powershell/Invoke-VerifyLocalIdentityConfig-Orchestrated.ps1 @@ -19,7 +19,7 @@ Source: https://learn.microsoft.com/en-us/azure/azure-local/deploy/deployment-local-identity-with-key-vault .PARAMETER ConfigPath - Path to infrastructure.yml. Defaults to 'configs/infrastructure.yml' relative + Path to infrastructure.yml. Defaults to 'config/infrastructure.yml' relative to the working directory. .PARAMETER Credential @@ -43,9 +43,9 @@ Execution: Run from management server with access to infrastructure.yml .EXAMPLE - .\Invoke-VerifyLocalIdentityConfig-Orchestrated.ps1 -ConfigPath configs/infrastructure.yml - .\Invoke-VerifyLocalIdentityConfig-Orchestrated.ps1 -ConfigPath configs/infrastructure.yml -TargetNode iic-01-n01,iic-01-n02 - .\Invoke-VerifyLocalIdentityConfig-Orchestrated.ps1 -ConfigPath configs/infrastructure.yml -WhatIf + .\Invoke-VerifyLocalIdentityConfig-Orchestrated.ps1 -ConfigPath config/infrastructure.yml + .\Invoke-VerifyLocalIdentityConfig-Orchestrated.ps1 -ConfigPath config/infrastructure.yml -TargetNode iic-01-n01,iic-01-n02 + .\Invoke-VerifyLocalIdentityConfig-Orchestrated.ps1 -ConfigPath config/infrastructure.yml -WhatIf #> [CmdletBinding(SupportsShouldProcess)] diff --git a/scripts/deploy/04-cluster-deployment/phase-06-post-deployment/task-01-deploy-sdn/powershell/Get-VirtualSwitchName-Standalone.ps1 b/scripts/deploy/04-cluster-deployment/phase-06-post-deployment/task-01-deploy-sdn/powershell/Get-VirtualSwitchName-Standalone.ps1 index 4de6ada..f949cbb 100644 --- a/scripts/deploy/04-cluster-deployment/phase-06-post-deployment/task-01-deploy-sdn/powershell/Get-VirtualSwitchName-Standalone.ps1 +++ b/scripts/deploy/04-cluster-deployment/phase-06-post-deployment/task-01-deploy-sdn/powershell/Get-VirtualSwitchName-Standalone.ps1 @@ -27,7 +27,7 @@ $switches | Format-Table Name, SwitchType, NetAdapterInterfaceDescription -AutoS $primary = $switches | Select-Object -First 1 Write-Host "================================================================" -ForegroundColor Green -Write-Host " Copy this value into configs/infrastructure.yml:" -ForegroundColor Green +Write-Host " Copy this value into config/infrastructure.yml:" -ForegroundColor Green Write-Host "" Write-Host " compute:" -ForegroundColor White Write-Host " azure_local:" -ForegroundColor White diff --git a/scripts/deploy/04-cluster-deployment/phase-06-post-deployment/task-04-ssh-connectivity-to-nodes/powershell/Invoke-SSHConnectivity-Orchestrated.ps1 b/scripts/deploy/04-cluster-deployment/phase-06-post-deployment/task-04-ssh-connectivity-to-nodes/powershell/Invoke-SSHConnectivity-Orchestrated.ps1 index 781360e..9e3b122 100644 --- a/scripts/deploy/04-cluster-deployment/phase-06-post-deployment/task-04-ssh-connectivity-to-nodes/powershell/Invoke-SSHConnectivity-Orchestrated.ps1 +++ b/scripts/deploy/04-cluster-deployment/phase-06-post-deployment/task-04-ssh-connectivity-to-nodes/powershell/Invoke-SSHConnectivity-Orchestrated.ps1 @@ -19,7 +19,7 @@ No WinRM/PSRemoting required — the Arc agent handles the OpenSSH install. .PARAMETER ConfigPath - Path to infrastructure YAML config. Defaults to configs/infrastructure.yml + Path to infrastructure YAML config. Defaults to config/infrastructure.yml relative to CWD (repo root). .PARAMETER TargetNode diff --git a/scripts/deploy/04-cluster-deployment/phase-06-post-deployment/task-05-storage-configuration/powershell/Invoke-StorageCSV-Orchestrated.ps1 b/scripts/deploy/04-cluster-deployment/phase-06-post-deployment/task-05-storage-configuration/powershell/Invoke-StorageCSV-Orchestrated.ps1 index f6f7a76..58e5216 100644 --- a/scripts/deploy/04-cluster-deployment/phase-06-post-deployment/task-05-storage-configuration/powershell/Invoke-StorageCSV-Orchestrated.ps1 +++ b/scripts/deploy/04-cluster-deployment/phase-06-post-deployment/task-05-storage-configuration/powershell/Invoke-StorageCSV-Orchestrated.ps1 @@ -16,7 +16,7 @@ 3. Interactive Get-Credential prompt .PARAMETER ConfigPath - Path to infrastructure YAML. Defaults to configs/infrastructure.yml in CWD. + Path to infrastructure YAML. Defaults to config/infrastructure.yml in CWD. .PARAMETER Credential Override credential resolution — skips Key Vault and prompt. diff --git a/scripts/deploy/04-cluster-deployment/phase-06-post-deployment/task-05-storage-configuration/powershell/Invoke-StoragePaths-Orchestrated.ps1 b/scripts/deploy/04-cluster-deployment/phase-06-post-deployment/task-05-storage-configuration/powershell/Invoke-StoragePaths-Orchestrated.ps1 index 2d3c180..f6ee409 100644 --- a/scripts/deploy/04-cluster-deployment/phase-06-post-deployment/task-05-storage-configuration/powershell/Invoke-StoragePaths-Orchestrated.ps1 +++ b/scripts/deploy/04-cluster-deployment/phase-06-post-deployment/task-05-storage-configuration/powershell/Invoke-StoragePaths-Orchestrated.ps1 @@ -14,7 +14,7 @@ via az CLI from the management server. .PARAMETER ConfigPath - Path to infrastructure YAML. Defaults to configs/infrastructure.yml in CWD. + Path to infrastructure YAML. Defaults to config/infrastructure.yml in CWD. .PARAMETER Credential Not used for storage path registration (Azure CLI handles auth via az login). diff --git a/scripts/lifecycle/updates/monitoring/powershell/Monitor-Update.ps1 b/scripts/lifecycle/updates/monitoring/powershell/Monitor-Update.ps1 index 52f1352..3efa648 100644 --- a/scripts/lifecycle/updates/monitoring/powershell/Monitor-Update.ps1 +++ b/scripts/lifecycle/updates/monitoring/powershell/Monitor-Update.ps1 @@ -29,7 +29,7 @@ 3. Existing Connect-AzAccount / Get-AzContext .PARAMETER ConfigPath - Path to the infrastructure YAML config file (e.g. configs/infrastructure-azl-lab.yml). + Path to the infrastructure YAML config file (e.g. config/infrastructure-azl-lab.yml). When supplied, ResourceGroupName, ClusterName, SubscriptionId, TenantId, NodeIPs, KeyVaultName, and credentials are all resolved automatically from the config. Any explicitly supplied parameters override the config values. diff --git a/tools/Generate-SolutionConfig.ps1 b/tools/Generate-SolutionConfig.ps1 index 0acd5ce..b79f864 100644 --- a/tools/Generate-SolutionConfig.ps1 +++ b/tools/Generate-SolutionConfig.ps1 @@ -5,9 +5,9 @@ Generate a solution-specific YAML config from solutions.yaml + master-registry + infrastructure-.yml. .DESCRIPTION - Reads the solutions definition (configs/solutions.yaml), the master variable registry - (configs/variables/assets/master-registry.yaml), and an environment-specific infrastructure - file (configs/infrastructure-.yml) to produce a per-solution config file containing + Reads the solutions definition (config/solutions.yaml), the master variable registry + (config/schema/master-registry.yaml), and an environment-specific infrastructure + file (config/infrastructure-.yml) to produce a per-solution config file containing only the variables that solution needs — with actual environment values populated. Output path follows the convention: solutions//solution-.yml @@ -125,9 +125,9 @@ $outputData = [ordered]@{ generated_at = (Get-Date -Format "yyyy-MM-dd HH:mm:ss") generator = "Generate-SolutionConfig.ps1 v1.0.0" source_files = @( - "configs/solutions.yaml" - "configs/variables/assets/master-registry.yaml" - "configs/infrastructure-$Environment.yml" + "config/solutions.yaml" + "config/schema/master-registry.yaml" + "config/infrastructure-$Environment.yml" ) } } diff --git a/tools/planning/S2D_Capacity_Calculator_6.xlsx b/tools/planning/S2D_Capacity_Calculator_6.xlsx index 34fe363..c2367d3 100644 Binary files a/tools/planning/S2D_Capacity_Calculator_6.xlsx and b/tools/planning/S2D_Capacity_Calculator_6.xlsx differ