testing commit

terraform-cisco-modules · Oct 23, 2024 · c94759e · c94759e
1 parent 39542df
commit c94759e
Show file tree

Hide file tree

Showing 11 changed files with 173 additions and 95 deletions.
diff --git a/.terraform-docs.yml b/.terraform-docs.yml
@@ -29,14 +29,14 @@ content: |-
 
   ## Recommended Module Versions
 
-  ## Module(s) Release 4.2.11-18775 Compatibility
+  ## Module(s) Release 4.2.11-20241004054146474 Compatibility
 
   | **Module** | **API Version** | **Provider Version**  | **Appliance Version** | **Module Notes**
   | :-----------: | :-------------: | :------------------:  | :-------------------: | :--------------------------: |
-  | organizations | >=1.0.11-18775  | 1.0.57                | Not Supported         |  New Module to Manage Organizations/Resource Groups. |
-  | pools         | >=1.0.11-18775  | 1.0.57                | Not Supported         |  Adds IP Pool Block Level IP Configuration. |
-  | policies      | >=1.0.11-18775  | 1.0.57                | Not Supported         |  * New Scrub Policy  |
-  | profiles      | >=1.0.11-18775  | 1.0.57                | Not Supported         |  * Adds Scrub Policy to Server Profiles/Templates. |
+  | organizations | >=1.0.11-20241004054146474  | 1.0.57                | Not Supported         |  New Module to Manage Organizations/Resource Groups. |
+  | pools         | >=1.0.11-20241004054146474  | 1.0.57                | Not Supported         |  Adds IP Pool Block Level IP Configuration. |
+  | policies      | >=1.0.11-20241004054146474  | 1.0.57                | Not Supported         |  * New Scrub Policy  |
+  | profiles      | >=1.0.11-20241004054146474  | 1.0.57                | Not Supported         |  * Adds Scrub Policy to Server Profiles/Templates. |
 
   ## Module(s) Release 4.2.11-16712 Compatibility
 

diff --git a/README.md b/README.md
@@ -25,14 +25,14 @@
 
 ## Recommended Module Versions
 
-## Module(s) Release 4.2.11-18775 Compatibility
+## Module(s) Release 4.2.11-20241004054146474 Compatibility
 
 | **Module** | **API Version** | **Provider Version**  | **Appliance Version** | **Module Notes**
 | :-----------: | :-------------: | :------------------:  | :-------------------: | :--------------------------: |
-| organizations | >=1.0.11-18775  | 1.0.57                | Not Supported         |  New Module to Manage Organizations/Resource Groups. |
-| pools         | >=1.0.11-18775  | 1.0.57                | Not Supported         |  Adds IP Pool Block Level IP Configuration. |
-| policies      | >=1.0.11-18775  | 1.0.57                | Not Supported         |  * New Scrub Policy  |
-| profiles      | >=1.0.11-18775  | 1.0.57                | Not Supported         |  * Adds Scrub Policy to Server Profiles/Templates. |
+| organizations | >=1.0.11-20241004054146474  | 1.0.57                | Not Supported         |  New Module to Manage Organizations/Resource Groups. |
+| pools         | >=1.0.11-20241004054146474  | 1.0.57                | Not Supported         |  Adds IP Pool Block Level IP Configuration. |
+| policies      | >=1.0.11-20241004054146474  | 1.0.57                | Not Supported         |  * New Scrub Policy  |
+| profiles      | >=1.0.11-20241004054146474  | 1.0.57                | Not Supported         |  * Adds Scrub Policy to Server Profiles/Templates. |
 
 ## Module(s) Release 4.2.11-16712 Compatibility
 
@@ -337,10 +337,10 @@ terraform.exe apply "main.plan"
 
 | Name | Source | Version |
 |------|--------|---------|
-| <a name="module_organizations"></a> [organizations](#module\_organizations) | terraform-cisco-modules/organizations/intersight | 4.2.11-18775 |
-| <a name="module_pools"></a> [pools](#module\_pools) | terraform-cisco-modules/pools/intersight | 4.2.11-18775 |
-| <a name="module_policies"></a> [policies](#module\_policies) | terraform-cisco-modules/policies/intersight | 4.2.11-18775 |
-| <a name="module_profiles"></a> [profiles](#module\_profiles) | terraform-cisco-modules/profiles/intersight | 4.2.11-18775 |
+| <a name="module_organizations"></a> [organizations](#module\_organizations) | terraform-cisco-modules/organizations/intersight | 4.2.11-20241004054146474 |
+| <a name="module_pools"></a> [pools](#module\_pools) | terraform-cisco-modules/pools/intersight | 4.2.11-20241004054146474 |
+| <a name="module_policies"></a> [policies](#module\_policies) | terraform-cisco-modules/policies/intersight | 4.2.11-20241004054146474 |
+| <a name="module_profiles"></a> [profiles](#module\_profiles) | terraform-cisco-modules/profiles/intersight | 4.2.11-20241004054146474 |
 
 **NOTE: When the Data is merged from the YAML files, it will run through the modules using for_each loop(s).  Sensitive Variables cannot be added to a for_each loop, instead use the variables below to add sensitive values for policies.**
 

diff --git a/Wakanda/global_settings.ezi.yaml b/Wakanda/global_settings.ezi.yaml
@@ -8,4 +8,4 @@ global_settings:
     - key: "Module"
       value: "easy-imm"
     - key: "Version"
-      value: "4.2.11-18775"
+      value: "4.2.11-20241004054146474"
diff --git a/Wakanda/main.tf b/Wakanda/main.tf
@@ -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-18775"
+  version = "4.2.11-20241004054146474"
   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(
@@ -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-18775"
+  version = "4.2.11-20241004054146474"
   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(
@@ -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-18775"
+  version = "4.2.11-20241004054146474"
   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, [])]]]

diff --git a/bulk_issue/profiles/server.ezi.yaml b/bulk_issue/profiles/server.ezi.yaml
diff --git a/global_settings.ezi.yaml b/global_settings.ezi.yaml
@@ -8,4 +8,4 @@ global_settings:
     - key: "Module"
       value: "easy-imm"
     - key: "Version"
-      value: "4.2.11-18775"
+      value: "4.2.11-20241004054146474"
diff --git a/main.tf b/main.tf
@@ -20,7 +20,7 @@ data "utils_yaml_merge" "model" {
 module "organizations" {
   # source = "/home/tyscott/terraform-cisco-modules/terraform-intersight-organizations"
   source          = "terraform-cisco-modules/organizations/intersight"
-  version         = "4.2.11-18775"
+  version         = "4.2.11-20241004054146474"
   for_each        = { for i in ["map"] : i => i if length([setsubtract(keys(local.model), local.non_orgs)]) > 0 }
   global_settings = local.global_settings
   model           = { for k, v in local.model : k => v if length(regexall("^global_settings|intersight$", k)) == 0 }
@@ -34,7 +34,7 @@ module "organizations" {
 module "pools" {
   # source = "/home/tyscott/terraform-cisco-modules/terraform-intersight-pools"
   source  = "terraform-cisco-modules/pools/intersight"
-  version = "4.2.11-18775"
+  version = "4.2.11-20241004054146474"
   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(
@@ -56,7 +56,7 @@ module "pools" {
 module "policies" {
   # source = "/home/tyscott/terraform-cisco-modules/terraform-intersight-policies"
   source  = "terraform-cisco-modules/policies/intersight"
-  version = "4.2.11-18775"
+  version = "4.2.11-20241004054146474"
   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(
@@ -79,7 +79,7 @@ module "policies" {
 module "profiles" {
   # source = "/home/tyscott/terraform-cisco-modules/terraform-intersight-profiles"
   source  = "terraform-cisco-modules/profiles/intersight"
-  version = "4.2.11-18775"
+  version = "4.2.11-20241004054146474"
   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, [])]]]

diff --git a/policies/compute.ezi.yaml b/policies/compute.ezi.yaml
@@ -66,6 +66,9 @@ common:
     firmware_authenticate:
       cco_password: 1
       cco_user: 1
+    memory:
+      - dimm_blocklisting: false
+        name: memory_default
     scrub:
       - bios: false
         disk: false

diff --git a/recommended_firmware/README.md b/recommended_firmware/README.md
@@ -7,7 +7,7 @@ In the `recommended_firmware` folder is a simple terraform setup that you can us
 
 ## Updates
 
-* 2024-07-23: Output Below ran on August 22, 2024.
+* 2024-07-23: Output Below ran on October 23, 2024.
 
 Following is an example output:
 
@@ -67,6 +67,17 @@ recommended_firmware = {
       "UCSC-C240-M6",
       "UCSC-C245-M6",
     ])
+    "4.3(4.241014)" = tolist([
+      "UCSC-C245-M8",
+    ])
+    "4.3(4.241063)" = tolist([
+      "UCSC-C220-M7",
+      "UCSC-C225-M6",
+      "UCSC-C240-M7",
+    ])
+    "4.3(4.242038)" = tolist([
+      "UCSC-C225-M6",
+    ])
   }
 }
 ```
diff --git a/templates/server.ezi.yaml b/templates/server.ezi.yaml
@@ -54,6 +54,7 @@ common:
         ipmi_over_lan_policy: ipmi
         lan_connectivity_policy: aci-lcp
         local_user_policy: users
+        memory_policy: memory_default
         name: aci-M6-intel-virtual-tpm-M2-pxe
         power_policy: server
         san_connectivity_policy: scp