Skip to content

Commit

Permalink
commits for module updates to v4.2.11-18369 and provider version 1.0.54
Browse files Browse the repository at this point in the history
  • Loading branch information
scotttyso committed Sep 7, 2024
1 parent 90c67fc commit 80a20ed
Show file tree
Hide file tree
Showing 14 changed files with 1,112 additions and 215 deletions.
22 changes: 12 additions & 10 deletions .terraform-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,14 @@ content: |-
## Recommended Module Versions
## Module(s) Release 4.2.11-17769 Compatibility
## Module(s) Release 4.2.11-18369 Compatibility
| **Module** | **API Version** | **Provider Version** | **Appliance Version** | **Module Notes**
| :-----------: | :-------------: | :------------------: | :-------------------: | :--------------------------: |
| organizations | >=1.0.11-17769 | >=1.0.51 | Not Supported | New Module to Manage Organizations/Resource Groups. |
| pools | >=1.0.11-17769 | >=1.0.51 | Not Supported | Adds IP Pool Block Level IP Configuration. |
| policies | >=1.0.11-17769 | >=1.0.51 | Not Supported | adapter_config - Add physical_nic_mode_settings; bios - M8 AMD BIOS attributes; ethernet_network - QnQ capabilities; vnics - sriov; vnic/vhba templates |
| profiles | >=1.0.11-17769 | >=1.0.51 | Not Supported | Adds Chassis/Domain Templates. |
| organizations | >=1.0.11-18369 | >=1.0.54 | Not Supported | New Module to Manage Organizations/Resource Groups. |
| pools | >=1.0.11-18369 | >=1.0.54 | Not Supported | Adds IP Pool Block Level IP Configuration. |
| policies | >=1.0.11-18369 | >=1.0.54 | Not Supported | adapter_config - Add physical_nic_mode_settings; bios - M8 AMD BIOS attributes; ethernet_network - QnQ capabilities; vnics - sriov; vnic/vhba templates |
| profiles | >=1.0.11-18369 | >=1.0.54 | Not Supported | Adds Chassis/Domain Templates. |
## Module(s) Release 4.2.11-16711 Compatibility
Expand All @@ -50,7 +50,8 @@ content: |-
## Updates
* 2024-07-23: 2024-07-23: Recommended releases are 4.2.11-17769 or 4.2.11-16711. See Notes for modules above.
* 2024-09-07: Recommended releases are 4.2.11-18369 or 4.2.11-16711. This update changes the drive security policy to match the updated API of 1.0.11-18369. Make sure to update your variables.tf, locals.tf from the eas-imm repository to get the updated sensitive variables for drive_security. The variables have also been updated to do validation using the regular expression patterns from the API.
* 2024-07-23: Recommended releases are 4.2.11-17769 or 4.2.11-16711. See Notes for modules above.
* 2024-07-16: Terraform Provider 1.0.48, 1.0.49, and 1.0.50 depricated due to breaking BIOS changes and bulk_merger problems. Do not use these provider versions.
### [<ins>Back to Top<ins>](#easy-imm)
Expand Down Expand Up @@ -239,14 +240,15 @@ content: |-
```
### Drive Security - KMIP Sensitive Variables
* `drive_security_password`: If Authentication is supported/used by the KMIP Server, This is the User Password to Configure.
* `drive_security_current_security_key_passphrase`: Used by Manual and Remote Key Management, if the server has a previous passphrase configured.
* `drive_security_new_security_key_passphrase`: Used by Manual Key Management to Assign a new passphrase to the server.
* `drive_security_authentication_password`: If Authentication is supported/used by the KMIP Server, This is the User Password to Configure.
* `drive_security_server_ca_certificate`: KMIP Server CA Certificate Contents.
#### Linux - with tfenv
```bash
export drive_security_password='<drive_security_password>'
export drive_security_authentication_password='<drive_security_authentication_password>'
```
```bash
export drive_security_server_ca_certificate='<drive_security_server_ca_certificate_file_location>'
Expand All @@ -255,7 +257,7 @@ content: |-
#### Windows
```powershell
$env:TF_VAR_drive_security_password='<drive_security_password>'
$env:drive_security_authentication_password='<drive_security_authentication_password>'
```
```powershell
$env:TF_VAR_drive_security_server_ca_certificate='<drive_security_server_ca_certificate_file_location>'
Expand Down
106 changes: 55 additions & 51 deletions README.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Wakanda/global_settings.ezi.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ global_settings:
- key: "Module"
value: "easy-imm"
- key: "Version"
value: "4.2.11-16711"
value: "4.2.11-18369"
10 changes: 8 additions & 2 deletions Wakanda/locals.tf
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,14 @@ locals {
}
}
drive_security = {
current_security_key_passphrase = {
1 = var.drive_security_current_security_key_passphrase
}
new_security_key_passphrase = {
1 = var.drive_security_new_security_key_passphrase
}
password = {
1 = var.drive_security_password
1 = var.drive_security_authentication_password
}
server_public_root_ca_certificate = {
1 = fileexists(var.drive_security_server_ca_certificate
Expand All @@ -50,7 +56,7 @@ locals {
cco_password = { 1 = var.cco_password }
cco_user = { 1 = var.cco_user }
}
ipmi_over_lan = { encryption_key = { 1 = var.ipmi_key } }
ipmi_over_lan = { encryption_key = { 1 = var.ipmi_encryption_key } }
iscsi_boot = { password = { 1 = var.iscsi_boot_password } }
ldap = { password = { 1 = var.binding_parameters_password } }
local_user = {
Expand Down
6 changes: 3 additions & 3 deletions Wakanda/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ data "utils_yaml_merge" "model" {
module "pools" {
# source = "/home/tyscott/terraform-cisco-modules/terraform-intersight-pools"
source = "terraform-cisco-modules/pools/intersight"
version = "4.2.11-17769"
version = "4.2.11-18369"
for_each = {
for i in ["map"] : i => i if length(flatten([for org in setsubtract(keys(local.model), local.non_orgs) : [
for e in keys(lookup(local.model[org], "pools", {})) : e]])) > 0 || length(
Expand All @@ -42,7 +42,7 @@ module "pools" {
module "policies" {
# source = "/home/tyscott/terraform-cisco-modules/terraform-intersight-policies"
source = "terraform-cisco-modules/policies/intersight"
version = "4.2.11-17769"
version = "4.2.11-18369"
for_each = {
for i in ["map"] : i => i if length(flatten([for org in keys(local.model) : [
for e in keys(lookup(local.model[org], "policies", {})) : local.model[org].policies[e] if length(lookup(lookup(
Expand All @@ -64,7 +64,7 @@ module "policies" {
module "profiles" {
# source = "/home/tyscott/terraform-cisco-modules/terraform-intersight-profiles"
source = "terraform-cisco-modules/profiles/intersight"
version = "4.2.11-17769"
version = "4.2.11-18369"
for_each = {
for i in ["map"] : i => i if length(flatten([for org in keys(local.model) : [for e in ["profiles", "templates"] : [
for d in ["chassis", "domain", "server"] : lookup(lookup(local.model[org], e, {}), d, [])]]]
Expand Down
2 changes: 1 addition & 1 deletion Wakanda/provider.tf
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ terraform {
required_providers {
intersight = {
source = "CiscoDevNet/intersight"
version = "1.0.51"
version = "1.0.54"
}
time = {
source = "time"
Expand Down
Loading

0 comments on commit 80a20ed

Please sign in to comment.