Skip to content

Commit bd65e64

Browse files
scotttysoscotttyso
committed
updating to provider 1.0.59 API version 20241017091918219
1 parent 357d821 commit bd65e64

File tree

12 files changed

+174
-86
lines changed

12 files changed

+174
-86
lines changed

‎.terraform-docs.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,14 @@ content: |-
2929
3030
## Recommended Module Versions
3131
32-
## SaaS API Version >=1.0.11-20241004054146473
32+
## SaaS API Version >=1.0.11-20241017091918219
3333
3434
| **Module** | **Module Version** | **Provider Version** | **Appliance Version** | **Module Notes**
3535
| :-----------: | :----------------: | :------------------: | :-------------------: | :--------------------------: |
36-
| organizations | 4.2.11-20241004054146475 | 1.0.58 | Not Supported | New Module to Manage Organizations/Resource Groups. |
37-
| pools | 4.2.11-20241004054146475 | 1.0.58 | Not Supported | Adds IP Pool Block Level IP Configuration. |
38-
| policies | 4.2.11-20241004054146475 | 1.0.58 | Not Supported | * New Memory and Scrub Policies |
39-
| profiles | 4.2.11-20241004054146475 | 1.0.58 | Not Supported | * Adds Memory/Scrub Policies to Server Profiles/Templates. |
36+
| organizations | 4.2.11-20241017091918219 | 1.0.59 | Not Supported | New Module to Manage Organizations/Resource Groups. |
37+
| pools | 4.2.11-20241017091918219 | 1.0.59 | Not Supported | Adds IP Pool Block Level IP Configuration. |
38+
| policies | 4.2.11-20241017091918219 | 1.0.59 | Not Supported | * New Memory and Scrub Policies |
39+
| profiles | 4.2.11-20241017091918219 | 1.0.59 | Not Supported | * Adds Support for Certificate Management/LDAP to Domain Profiles/Templates. |
4040
4141
## CVA Version >=1.1.1-0 API Version >=1.0.11-18735
4242

‎README.md‎

Lines changed: 27 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,25 @@
2525

2626
## Recommended Module Versions
2727

28-
## SaaS API Version >=1.0.11-20241004054146473
28+
## SaaS API Version >=1.0.11-20241017091918219
2929

3030
| **Module** | **Module Version** | **Provider Version** | **Appliance Version** | **Module Notes**
3131
| :-----------: | :----------------: | :------------------: | :-------------------: | :--------------------------: |
32-
| organizations | 4.2.11-20241004054146474 | 1.0.58 | Not Supported | New Module to Manage Organizations/Resource Groups. |
33-
| pools | 4.2.11-20241004054146474 | 1.0.58 | Not Supported | Adds IP Pool Block Level IP Configuration. |
34-
| policies | 4.2.11-20241004054146474 | 1.0.58 | Not Supported | * New Memory and Scrub Policies |
35-
| profiles | 4.2.11-20241004054146474 | 1.0.58 | Not Supported | * Adds Memory/Scrub Policies to Server Profiles/Templates. |
32+
| organizations | 4.2.11-20241017091918219 | 1.0.59 | Not Supported | New Module to Manage Organizations/Resource Groups. |
33+
| pools | 4.2.11-20241017091918219 | 1.0.59 | Not Supported | Adds IP Pool Block Level IP Configuration. |
34+
| policies | 4.2.11-20241017091918219 | 1.0.59 | Not Supported | * New Memory and Scrub Policies |
35+
| profiles | 4.2.11-20241017091918219 | 1.0.59 | Not Supported | * Adds Support for Certificate Management/LDAP to Domain Profiles/Templates. |
3636

37-
## CVA/PVA Version >=1.1.0-0 API Version >=1.0.11-16711
37+
## CVA Version >=1.1.1-0 API Version >=1.0.11-18735
38+
39+
| **Module** | **Module Version** | **Provider Version** | **Appliance Version** | **Module Notes**
40+
| :-----------: | :----------------: | :------------------: | :-------------------: | :--------------------------: |
41+
| organizations | 4.2.11-18775 | 1.0.51 | >=1.1.1-0 | New Module to Manage Organizations/Resource Groups. |
42+
| pools | 4.2.11-16711 | 1.0.51 | >=1.1.1-0 | With IP Pools use Configuration outside IP Block. |
43+
| policies | 4.2.11-16713 | 1.0.51 | >=1.1.1-0 | Anything supported by YAML Schema Outside of New Features in 17769 |
44+
| profiles | 4.2.11-16712 | 1.0.51 | >=1.1.1-0 | * Adds Scrub Policies to Server Profiles/Templates. |
45+
46+
## PVA Version >=1.1.0-0 API Version >=1.0.11-16711
3847

3948
| **Module** | **Module Version** | **Provider Version** | **Appliance Version** | **Module Notes**
4049
| :-----------: | :----------------: | :------------------: | :-------------------: | :--------------------------: |
@@ -46,12 +55,15 @@
4655
### [<ins>Back to Top<ins>](#easy-imm)
4756

4857
## Updates
58+
* 2024-11-12: Recommended releases are 4.2.11-20241004054146475 (SaaS) or 4.2.11-18775 (CVA 1.1.1-0).
59+
<ins>IMPORTANT NOTE</ins>: 4.2.11-20241004054146475 introduces support for multi-ethernet network group policies for Ethernet Uplink Port-Channels and Ethernet Uplink. If you are still using older module versions make sure to point to the older JSON Schema for Visual Studio Code.
60+
For example: v4.2.11-18775 - https://github.com/terraform-cisco-modules/easy-imm/blob/39542dfc4ee2f368d42ff6a73ee4e08cb26a4c09/yaml_schema/easy-imm.json
4961
* 2024-10-23: Recommended releases are 4.2.11-20241004054146474 or 4.2.11-16712. Adding Memory Policy. Intersight API versioning changed to include date.
5062
* 2024-10-11: Recommended releases are 4.2.11-18775 or 4.2.11-16712. Adding Scrub Policy.
5163
* 2024-09-13: Recommended releases are 4.2.11-18371 or 4.2.11-16712. ISSUE 287 resolved.
5264
* 2024-09-08: Rolling back SaaS recommendation to 4.2.11-17769 since provider v1.0.54 is broken again for server templates [ISSUE 287](https://github.com/CiscoDevNet/terraform-provider-intersight/issues/287) . Version v4.2.11-18369 and v4.2.11-18370 is on hold for now until provider fixed.
5365
* 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.
54-
* 2024-07-23: Recommended releases are 4.2.11-17769 or 4.2.11-16711. See Notes for modules above.
66+
* 2024-07-23: Recommended releases are 4.2.11-17769 or 4.2.11-16711.
5567
* 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.
5668

5769
### [<ins>Back to Top<ins>](#easy-imm)
@@ -183,8 +195,9 @@ In example, if you needed to add 100 iterations of the `certificate_management`
183195

184196
### Terraform Cloud/Enterprise - Workspace Variables
185197

186-
- Add variable `intersight_api_key_id` with the value of <your-api-key>
187-
- Add variable `intersight_secret_key` with the value of <your-secret-file-content>
198+
- Add variable `intersight_api_key_id` with the value of <ins>your-intersight-api-key</ins>
199+
- Add variable `intersight_secret_key` with the value of <ins>your-intersight-secret-file-content</ins>
200+
- Add additional variables as required for the sensitive policy values
188201

189202
#### Add Other Variables as discussed below based on use cases.
190203

@@ -319,7 +332,7 @@ terraform.exe apply "main.plan"
319332
| Name | Version |
320333
|------|---------|
321334
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >=1.3.0 |
322-
| <a name="requirement_intersight"></a> [intersight](#requirement\_intersight) | 1.0.58 |
335+
| <a name="requirement_intersight"></a> [intersight](#requirement\_intersight) | 1.0.59 |
323336
| <a name="requirement_time"></a> [time](#requirement\_time) | 0.9.1 |
324337
| <a name="requirement_utils"></a> [utils](#requirement\_utils) | >= 0.1.3 |
325338

@@ -337,10 +350,10 @@ terraform.exe apply "main.plan"
337350

338351
| Name | Source | Version |
339352
|------|--------|---------|
340-
| <a name="module_organizations"></a> [organizations](#module\_organizations) | terraform-cisco-modules/organizations/intersight | 4.2.11-20241004054146474 |
341-
| <a name="module_pools"></a> [pools](#module\_pools) | terraform-cisco-modules/pools/intersight | 4.2.11-20241004054146474 |
342-
| <a name="module_policies"></a> [policies](#module\_policies) | terraform-cisco-modules/policies/intersight | 4.2.11-20241004054146474 |
343-
| <a name="module_profiles"></a> [profiles](#module\_profiles) | terraform-cisco-modules/profiles/intersight | 4.2.11-20241004054146474 |
353+
| <a name="module_organizations"></a> [organizations](#module\_organizations) | terraform-cisco-modules/organizations/intersight | 4.2.11-20241017091918219 |
354+
| <a name="module_pools"></a> [pools](#module\_pools) | terraform-cisco-modules/pools/intersight | 4.2.11-20241017091918219 |
355+
| <a name="module_policies"></a> [policies](#module\_policies) | terraform-cisco-modules/policies/intersight | 4.2.11-20241017091918219 |
356+
| <a name="module_profiles"></a> [profiles](#module\_profiles) | /home/tyscott/terraform-cisco-modules/terraform-intersight-profiles | n/a |
344357

345358
**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.**
346359

‎Wakanda/global_settings.ezi.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ global_settings:
88
- key: "Module"
99
value: "easy-imm"
1010
- key: "Version"
11-
value: "4.2.11-20241004054146475"
11+
value: "4.2.11-20241017091918219"

‎Wakanda/main.tf‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ data "utils_yaml_merge" "model" {
2020
module "pools" {
2121
# source = "/home/tyscott/terraform-cisco-modules/terraform-intersight-pools"
2222
source = "terraform-cisco-modules/pools/intersight"
23-
version = "4.2.11-20241004054146475"
23+
version = "4.2.11-20241017091918219"
2424
for_each = {
2525
for i in ["map"] : i => i if length(flatten([for org in setsubtract(keys(local.model), local.non_orgs) : [
2626
for e in keys(lookup(local.model[org], "pools", {})) : e]])) > 0 || length(
@@ -42,7 +42,7 @@ module "pools" {
4242
module "policies" {
4343
# source = "/home/tyscott/terraform-cisco-modules/terraform-intersight-policies"
4444
source = "terraform-cisco-modules/policies/intersight"
45-
version = "4.2.11-20241004054146475"
45+
version = "4.2.11-20241017091918219"
4646
for_each = {
4747
for i in ["map"] : i => i if length(flatten([for org in keys(local.model) : [
4848
for e in keys(lookup(local.model[org], "policies", {})) : local.model[org].policies[e] if length(lookup(lookup(
@@ -64,7 +64,7 @@ module "policies" {
6464
module "profiles" {
6565
# source = "/home/tyscott/terraform-cisco-modules/terraform-intersight-profiles"
6666
source = "terraform-cisco-modules/profiles/intersight"
67-
version = "4.2.11-20241004054146475"
67+
version = "4.2.11-20241017091918219"
6868
for_each = {
6969
for i in ["map"] : i => i if length(flatten([for org in keys(local.model) : [for e in ["profiles", "templates"] : [
7070
for d in ["chassis", "domain", "server"] : lookup(lookup(local.model[org], e, {}), d, [])]]]

‎Wakanda/provider.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ terraform {
88
required_providers {
99
intersight = {
1010
source = "CiscoDevNet/intersight"
11-
version = "1.0.58"
11+
version = "1.0.59"
1212
}
1313
time = {
1414
source = "time"

‎global_settings.ezi.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ global_settings:
88
- key: "Module"
99
value: "easy-imm"
1010
- key: "Version"
11-
value: "4.2.11-20241004054146475"
11+
value: "4.2.11-20241017091918219"

‎main.tf‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ data "utils_yaml_merge" "model" {
2020
module "organizations" {
2121
# source = "/home/tyscott/terraform-cisco-modules/terraform-intersight-organizations"
2222
source = "terraform-cisco-modules/organizations/intersight"
23-
version = "4.2.11-20241004054146475"
23+
version = "4.2.11-20241017091918219"
2424
for_each = { for i in ["map"] : i => i if length([setsubtract(keys(local.model), local.non_orgs)]) > 0 }
2525
global_settings = local.global_settings
2626
model = { for k, v in local.model : k => v if length(regexall("^global_settings|intersight$", k)) == 0 }
@@ -34,7 +34,7 @@ module "organizations" {
3434
module "pools" {
3535
# source = "/home/tyscott/terraform-cisco-modules/terraform-intersight-pools"
3636
source = "terraform-cisco-modules/pools/intersight"
37-
version = "4.2.11-20241004054146475"
37+
version = "4.2.11-20241017091918219"
3838
for_each = {
3939
for i in ["map"] : i => i if length(flatten([for org in setsubtract(keys(local.model), local.non_orgs) : [
4040
for e in keys(lookup(local.model[org], "pools", {})) : e]])) > 0 || length(
@@ -56,7 +56,7 @@ module "pools" {
5656
module "policies" {
5757
# source = "/home/tyscott/terraform-cisco-modules/terraform-intersight-policies"
5858
source = "terraform-cisco-modules/policies/intersight"
59-
version = "4.2.11-20241004054146475"
59+
version = "4.2.11-20241017091918219"
6060
for_each = {
6161
for i in ["map"] : i => i if length(flatten([for org in keys(local.model) : [
6262
for e in keys(lookup(local.model[org], "policies", {})) : local.model[org].policies[e] if length(lookup(lookup(
@@ -77,9 +77,9 @@ module "policies" {
7777
# GUI Location: Infrastructure Service > Configure > Templates
7878
#_________________________________________________________________________________________
7979
module "profiles" {
80-
# source = "/home/tyscott/terraform-cisco-modules/terraform-intersight-profiles"
81-
source = "terraform-cisco-modules/profiles/intersight"
82-
version = "4.2.11-20241004054146475"
80+
source = "/home/tyscott/terraform-cisco-modules/terraform-intersight-profiles"
81+
# source = "terraform-cisco-modules/profiles/intersight"
82+
# version = "4.2.11-20241017091918219"
8383
for_each = {
8484
for i in ["map"] : i => i if length(flatten([for org in keys(local.model) : [for e in ["profiles", "templates"] : [
8585
for d in ["chassis", "domain", "server"] : lookup(lookup(local.model[org], e, {}), d, [])]]]

‎policies/management.ezi.yaml‎

Lines changed: 26 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,31 @@ common:
1515
- description: ipmi IPMI over LAN Policy
1616
name: ipmi
1717
privilege: admin
18+
ldap:
19+
- base_settings:
20+
domain: rich.ciscolabs.com
21+
binding_parameters:
22+
bind_method: LoginCredentials
23+
description: RICH LDAP Policy
24+
enable_group_authorization: true
25+
ldap_groups:
26+
- end_point_role: admin
27+
group_dn: CN=Domain Admins,OU=Users,DC=rich,DC=ciscolabs,DC=com
28+
name: Domain Admins
29+
ldap_servers:
30+
- port: 389
31+
server: 10.101.128.15
32+
vendor: MSAD
33+
- port: 389
34+
server: 10.101.128.16
35+
vendor: MSAD
36+
name: RICH
37+
nested_group_search_depth: 128
38+
search_parameters:
39+
attribute: CiscoAvPair
40+
filter: sAMAccountName
41+
group_attribute: memberOf
42+
user_search_precedence: LocalUserDb
1843
local_user:
1944
- description: users Local User Policy
2045
name: users
@@ -68,34 +93,8 @@ default:
6893
- configuration_from_intersight_only: false
6994
description: devcon Device Connector Policy
7095
name: devcon
71-
ldap:
72-
- base_settings:
73-
base_dn: DC=example,DC=com
74-
domain: example.com
75-
timeout: 0
76-
binding_parameters:
77-
bind_method: LoginCredentials
78-
description: ldap LDAP Policy
79-
enable_encryption: true
80-
enable_group_authorization: true
81-
enable_ldap: true
82-
ldap_groups:
83-
- name: ucs-admins
84-
role: admin
85-
- name: netops
86-
role: user
87-
ldap_servers:
88-
- port: 636
89-
server: 198.18.6.36
90-
name: ldap
91-
nested_group_search_depth: 128
92-
search_parameters:
93-
attribute: CiscoAvPair
94-
filter: sAMAccountName
95-
group_attribute: memberOf
96-
user_search_precedence: LocalUserDb
9796
network_connectivity:
98-
- description: dns Network Connectivity Policy
97+
- description: dns_with_v6 Network Connectivity Policy
9998
dns_servers_v4:
10099
- 208.67.220.220
101100
- 208.67.222.222

‎policies/templates.ezi.yaml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ common:
1818
enable_failover: true
1919
ethernet_adapter_policy: Win-AzureStack
2020
ethernet_network_control_policy: both
21-
ethernet_network_group_policy: aci-mgmt
21+
ethernet_network_group_policies:
22+
- aci-mgmt
2223
ethernet_qos_policy: best-effort
2324
mac_address_pool: dual-fabric
2425
name: vnic0

‎profiles/domain.ezi.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ Asgard:
77
domain:
88
- action: No-op
99
description: r143e-1 UCS Domain Profile
10+
ldap_policy: common/RICH
1011
name: r143e-1
1112
network_connectivity_policy: common/dns
1213
ntp_policy: common/ntp

0 commit comments

Comments
 (0)