updating examples and updated snmp module

terraform-cisco-modules · Dec 2, 2021 · 6f4b944 · 6f4b944
1 parent 1ab4678
commit 6f4b944
Show file tree

Hide file tree

Showing 79 changed files with 3,257 additions and 190 deletions.
diff --git a/examples/ucs_profiles/README.md → examples/policies/README.md b/examples/ucs_profiles/README.md → examples/policies/README.md
diff --git a/...rofiles/adapter_configuration_policies.tf → ...olicies/adapter_configuration_policies.tf b/...rofiles/adapter_configuration_policies.tf → ...olicies/adapter_configuration_policies.tf
diff --git a/examples/ucs_profiles/bios_policies.tf → examples/policies/bios_policies.tf b/examples/ucs_profiles/bios_policies.tf → examples/policies/bios_policies.tf
diff --git a/examples/ucs_profiles/boot_order_policies.tf → examples/policies/boot_order_policies.tf b/examples/ucs_profiles/boot_order_policies.tf → examples/policies/boot_order_policies.tf
diff --git a/...ofiles/certificate_management_policies.tf → ...licies/certificate_management_policies.tf b/...ofiles/certificate_management_policies.tf → ...licies/certificate_management_policies.tf
diff --git a/examples/ucs_profiles/data_sources.tf → examples/policies/data_sources.tf b/examples/ucs_profiles/data_sources.tf → examples/policies/data_sources.tf
diff --git a/...ucs_profiles/device_connector_policies.tf → ...les/policies/device_connector_policies.tf b/...ucs_profiles/device_connector_policies.tf → ...les/policies/device_connector_policies.tf
diff --git a/...ucs_profiles/ethernet_adapter_policies.tf → ...les/policies/ethernet_adapter_policies.tf b/...ucs_profiles/ethernet_adapter_policies.tf → ...les/policies/ethernet_adapter_policies.tf
diff --git a/...iles/ethernet_network_control_policies.tf → ...cies/ethernet_network_control_policies.tf b/...iles/ethernet_network_control_policies.tf → ...cies/ethernet_network_control_policies.tf
diff --git a/...ofiles/ethernet_network_group_policies.tf → ...licies/ethernet_network_group_policies.tf b/...ofiles/ethernet_network_group_policies.tf → ...licies/ethernet_network_group_policies.tf
diff --git a/...ucs_profiles/ethernet_network_policies.tf → ...les/policies/ethernet_network_policies.tf b/...ucs_profiles/ethernet_network_policies.tf → ...les/policies/ethernet_network_policies.tf
diff --git a/...les/ucs_profiles/ethernet_qos_policies.tf → examples/policies/ethernet_qos_policies.tf b/...les/ucs_profiles/ethernet_qos_policies.tf → examples/policies/ethernet_qos_policies.tf
diff --git a/...rofiles/fibre_channel_adapter_policies.tf → ...olicies/fibre_channel_adapter_policies.tf b/...rofiles/fibre_channel_adapter_policies.tf → ...olicies/fibre_channel_adapter_policies.tf
diff --git a/...rofiles/fibre_channel_network_policies.tf → ...olicies/fibre_channel_network_policies.tf b/...rofiles/fibre_channel_network_policies.tf → ...olicies/fibre_channel_network_policies.tf
diff --git a/...cs_profiles/fibre_channel_qos_policies.tf → ...es/policies/fibre_channel_qos_policies.tf b/...cs_profiles/fibre_channel_qos_policies.tf → ...es/policies/fibre_channel_qos_policies.tf
diff --git a/...les/ucs_profiles/flow_control_policies.tf → examples/policies/flow_control_policies.tf b/...les/ucs_profiles/flow_control_policies.tf → examples/policies/flow_control_policies.tf
diff --git a/examples/ucs_profiles/imc_access_policies.tf → examples/policies/imc_access_policies.tf b/examples/ucs_profiles/imc_access_policies.tf → examples/policies/imc_access_policies.tf
diff --git a/...es/ucs_profiles/ipmi_over_lan_policies.tf → examples/policies/ipmi_over_lan_policies.tf b/...es/ucs_profiles/ipmi_over_lan_policies.tf → examples/policies/ipmi_over_lan_policies.tf
diff --git a/...es/ucs_profiles/iscsi_adapter_policies.tf → examples/policies/iscsi_adapter_policies.tf b/...es/ucs_profiles/iscsi_adapter_policies.tf → examples/policies/iscsi_adapter_policies.tf
diff --git a/examples/ucs_profiles/iscsi_boot_policies.tf → examples/policies/iscsi_boot_policies.tf b/examples/ucs_profiles/iscsi_boot_policies.tf → examples/policies/iscsi_boot_policies.tf
diff --git a/..._profiles/iscsi_static_target_policies.tf → .../policies/iscsi_static_target_policies.tf b/..._profiles/iscsi_static_target_policies.tf → .../policies/iscsi_static_target_policies.tf
diff --git a/...ucs_profiles/lan_connectivity_policies.tf → ...les/policies/lan_connectivity_policies.tf b/...ucs_profiles/lan_connectivity_policies.tf → ...les/policies/lan_connectivity_policies.tf
diff --git a/examples/ucs_profiles/ldap_policies.tf → examples/policies/ldap_policies.tf b/examples/ucs_profiles/ldap_policies.tf → examples/policies/ldap_policies.tf
diff --git a/...ucs_profiles/link_aggregation_policies.tf → ...les/policies/link_aggregation_policies.tf b/...ucs_profiles/link_aggregation_policies.tf → ...les/policies/link_aggregation_policies.tf
diff --git a/...les/ucs_profiles/link_control_policies.tf → examples/policies/link_control_policies.tf b/...les/ucs_profiles/link_control_policies.tf → examples/policies/link_control_policies.tf
diff --git a/examples/ucs_profiles/local_user_policies.tf → examples/policies/local_user_policies.tf b/examples/ucs_profiles/local_user_policies.tf → examples/policies/local_user_policies.tf
diff --git a/...profiles/network_connectivity_policies.tf → ...policies/network_connectivity_policies.tf b/...profiles/network_connectivity_policies.tf → ...policies/network_connectivity_policies.tf
diff --git a/examples/ucs_profiles/ntp_policies.tf → examples/policies/ntp_policies.tf b/examples/ucs_profiles/ntp_policies.tf → examples/policies/ntp_policies.tf
diff --git a/examples/ucs_profiles/outputs.tf → examples/policies/outputs.tf b/examples/ucs_profiles/outputs.tf → examples/policies/outputs.tf
diff --git a/...cs_profiles/persistent_memory_policies.tf → ...es/policies/persistent_memory_policies.tf b/...cs_profiles/persistent_memory_policies.tf → ...es/policies/persistent_memory_policies.tf
diff --git a/examples/ucs_profiles/port_policies.tf → examples/policies/port_policies.tf b/examples/ucs_profiles/port_policies.tf → examples/policies/port_policies.tf
diff --git a/examples/ucs_profiles/providers.tf → examples/policies/providers.tf b/examples/ucs_profiles/providers.tf → examples/policies/providers.tf
diff --git a/...ucs_profiles/san_connectivity_policies.tf → ...les/policies/san_connectivity_policies.tf b/...ucs_profiles/san_connectivity_policies.tf → ...les/policies/san_connectivity_policies.tf
diff --git a/examples/ucs_profiles/sd_card_policies.tf → examples/policies/sd_card_policies.tf b/examples/ucs_profiles/sd_card_policies.tf → examples/policies/sd_card_policies.tf
diff --git a/.../ucs_profiles/serial_over_lan_policies.tf → ...ples/policies/serial_over_lan_policies.tf b/.../ucs_profiles/serial_over_lan_policies.tf → ...ples/policies/serial_over_lan_policies.tf
diff --git a/examples/ucs_profiles/smtp_policies.tf → examples/policies/smtp_policies.tf b/examples/ucs_profiles/smtp_policies.tf → examples/policies/smtp_policies.tf
diff --git a/examples/ucs_profiles/snmp_policies.tf → examples/policies/snmp_policies.tf b/examples/ucs_profiles/snmp_policies.tf → examples/policies/snmp_policies.tf
diff --git a/examples/ucs_profiles/ssh_policies.tf → examples/policies/ssh_policies.tf b/examples/ucs_profiles/ssh_policies.tf → examples/policies/ssh_policies.tf
diff --git a/examples/ucs_profiles/storage_policies.tf → examples/policies/storage_policies.tf b/examples/ucs_profiles/storage_policies.tf → examples/policies/storage_policies.tf
diff --git a/...s/ucs_profiles/switch_control_policies.tf → examples/policies/switch_control_policies.tf b/...s/ucs_profiles/switch_control_policies.tf → examples/policies/switch_control_policies.tf
diff --git a/examples/ucs_profiles/syslog_policies.tf → examples/policies/syslog_policies.tf b/examples/ucs_profiles/syslog_policies.tf → examples/policies/syslog_policies.tf
diff --git a/examples/ucs_profiles/system_qos_policies.tf → examples/policies/system_qos_policies.tf b/examples/ucs_profiles/system_qos_policies.tf → examples/policies/system_qos_policies.tf
diff --git a/examples/ucs_profiles/variables.tf → examples/policies/variables.tf b/examples/ucs_profiles/variables.tf → examples/policies/variables.tf
diff --git a/examples/ucs_profiles/variables_bios.tf → examples/policies/variables_bios.tf b/examples/ucs_profiles/variables_bios.tf → examples/policies/variables_bios.tf
diff --git a/examples/ucs_profiles/variables_policies.tf → examples/policies/variables_policies.tf b/examples/ucs_profiles/variables_policies.tf → examples/policies/variables_policies.tf
diff --git a/examples/ucs_profiles/variables_vnic.tf → examples/policies/variables_vnic.tf b/examples/ucs_profiles/variables_vnic.tf → examples/policies/variables_vnic.tf
diff --git a/...ples/ucs_profiles/virtual_kvm_policies.tf → examples/policies/virtual_kvm_policies.tf b/...ples/ucs_profiles/virtual_kvm_policies.tf → examples/policies/virtual_kvm_policies.tf
diff --git a/...es/ucs_profiles/virtual_media_policies.tf → examples/policies/virtual_media_policies.tf b/...es/ucs_profiles/virtual_media_policies.tf → examples/policies/virtual_media_policies.tf
diff --git a/examples/ucs_profiles/vsan_policies.tf → examples/policies/vsan_policies.tf b/examples/ucs_profiles/vsan_policies.tf → examples/policies/vsan_policies.tf
diff --git a/examples/policies_vlan/README.md b/examples/policies_vlan/README.md
diff --git a/examples/ucs_profiles/multicast_policies.tf → examples/policies_vlan/multicast_policies.tf b/examples/ucs_profiles/multicast_policies.tf → examples/policies_vlan/multicast_policies.tf
diff --git a/examples/ucs_profiles/vlan_policies.tf → examples/policies_vlan/vlan_policies.tf b/examples/ucs_profiles/vlan_policies.tf → examples/policies_vlan/vlan_policies.tf
diff --git a/examples/pools/fc_pools.tf b/examples/pools/fc_pools.tf
@@ -13,63 +13,71 @@ module "wwnn_pool" {
   depends_on = [
     data.intersight_organization_organization.org_moid
   ]
+  version          = ">=0.9.6"
   source           = "terraform-cisco-modules/imm/intersight//modules/fc_pools"
   assignment_order = "sequential"
   description      = "WWNN Pool Example."
   name             = "wwn_pool"
   org_moid         = local.org_moid
   pool_purpose     = "WWNN"
   tags             = var.tags
-  id_blocks = [
-    {
+  id_blocks = {
+    "0" = {
       from = "20:00:00:25:B5:00:00:00"
-      to   = "20:00:00:25:B5:00:01:ff"
+      size = 256
+      # to   = "20:00:00:25:B5:00:01:ff"
     }
-  ]
+  }
 }
 
 module "wwpn_pool_a" {
   depends_on = [
     data.intersight_organization_organization.org_moid
   ]
+  version          = ">=0.9.6"
   source           = "terraform-cisco-modules/imm/intersight//modules/fc_pools"
   assignment_order = "sequential"
   description      = "WWPN Pool A Example."
   name             = "wwpn_pool_a"
   org_moid         = local.org_moid
   tags             = var.tags
-  id_blocks = [
-    {
+  id_blocks = {
+    "0" = {
       from = "20:00:00:25:B5:0a:00:00"
-      to   = "20:00:00:25:B5:0a:00:ff"
+      size = 256
+      # to   = "20:00:00:25:B5:0a:00:ff"
     },
-    {
+    "1" = {
       from = "20:00:00:25:B5:0a:01:00"
-      to   = "20:00:00:25:B5:0a:01:ff"
+      size = 256
+      # to   = "20:00:00:25:B5:0a:01:ff"
     }
-  ]
+  }
 }
 
 module "wwpn_pool_b" {
   depends_on = [
     data.intersight_organization_organization.org_moid
   ]
+  version          = ">=0.9.6"
   source           = "terraform-cisco-modules/imm/intersight//modules/fc_pools"
   assignment_order = "sequential"
   description      = "WWPN Pool B Example."
   name             = "wwpn_pool_b"
   org_moid         = local.org_moid
   tags             = var.tags
-  id_blocks = [
-    {
+  id_blocks = {
+    "0" = {
       from = "20:00:00:25:B5:0b:00:00"
-      to   = "20:00:00:25:B5:0b:00:ff"
+      size = 256
+      # to   = "20:00:00:25:B5:0b:00:ff"
     },
-    {
+    "1" = {
       from = "20:00:00:25:B5:0b:01:00"
-      to   = "20:00:00:25:B5:0b:01:ff"
+      size = 256
+      # to   = "20:00:00:25:B5:0b:01:ff"
     }
-  ]
+  }
 }
 
 #______________________________________________
@@ -90,7 +98,7 @@ module "wwxn_pool_default" {
   org_moid            = local.org_moid
   pool_purpose        = "WWPN"
   tags                = var.tags
-  id_blocks           = []
+  id_blocks           = {}
 }
 
 */
diff --git a/examples/pools/ip_pools.tf b/examples/pools/ip_pools.tf
@@ -13,43 +13,48 @@ module "ip_pool_1" {
   depends_on = [
     data.intersight_organization_organization.org_moid
   ]
+  version          = ">=0.9.6"
   source           = "terraform-cisco-modules/imm/intersight//modules/ip_pools"
   assignment_order = "sequential"
   description      = "IP Pool 1 Example."
-  dns_servers_v4   = var.dns_servers_v4
-  dns_servers_v6   = var.dns_servers_v6
   name             = "ip_pool_1"
   org_moid         = local.org_moid
   tags             = var.tags
-  ipv4_block = [
-    {
+  ipv4_block = {
+    "0" = {
       from = "198.18.1.32"
-      to   = "198.18.1.63"
+      size = 32
+      # to   = "198.18.1.63"
     },
-    {
+    "1" = {
       from = "198.18.1.64"
-      to   = "198.18.1.95"
+      size = 32
+      # to   = "198.18.1.95"
     }
-  ]
-  ipv4_config = [
-    {
-      gateway = "198.18.1.1"
-      netmask = "255.255.255.0"
+  }
+  ipv4_config = {
+    "config" = {
+      gateway       = "198.18.1.1"
+      netmask       = "255.255.255.0"
+      primary_dns   = "198.18.1.10"
+      secondary_dns = "198.18.1.11"
     }
-  ]
-  ipv6_block = [
-    {
+  }
+  ipv6_block = {
+    "0" = {
       from = "2001:002:1::32"
-      size = 31
+      size = 32
       # to   = "2001:002:1::63"
     }
-  ]
-  ipv6_config = [
-    {
-      gateway = "2001:002:1::1"
-      prefix  = 64
+  }
+  ipv6_config = {
+    "config" = {
+      gateway       = "2001:002:1::1"
+      prefix        = 64
+      primary_dns   = "2001:002:1::10"
+      secondary_dns = "2001:002:1::11"
     }
-  ]
+  }
 }
 
 
@@ -63,24 +68,27 @@ module "ip_pool_2" {
     data.intersight_organization_organization.org_moid
   ]
   source           = "terraform-cisco-modules/imm/intersight//modules/ip_pools"
+  version          = ">=0.9.6"
   assignment_order = "sequential"
   description      = "IP Pool 2 Example."
-  dns_servers_v4   = var.dns_servers_v4
   name             = "ip_pool_2"
   org_moid         = local.org_moid
   tags             = var.tags
-  ipv4_block = [
-    {
+  ipv4_block = {
+    "0" = {
       from = "198.18.2.32"
-      to   = "198.18.2.63"
+      size = 32
+      # to   = "198.18.2.63"
     }
-  ]
-  ipv4_config = [
-    {
-      gateway = "198.18.2.1"
-      netmask = "255.255.255.0"
+  }
+  ipv4_config = {
+    "config" = {
+      gateway       = "198.18.2.1"
+      netmask       = "255.255.255.0"
+      primary_dns   = "198.18.1.10"
+      secondary_dns = "198.18.1.11"
     }
-  ]
+  }
 }
 
 #______________________________________________
@@ -97,15 +105,13 @@ module "ip_pool_default" {
   source              = "terraform-cisco-modules/imm/intersight//modules/ip_pools"
   assignment_order    = "default"
   description         = ""
-  dns_servers_v4      = var.dns_servers_v4
-  dns_servers_v6      = var.dns_servers_v6
   name                = "default"
   org_moid            = local.org_moid
   tags                = var.tags
-  ipv4_block          = []
-  ipv4_config         = []
-  ipv6_block          = []
-  ipv6_config         = []
+  ipv4_block          = {}
+  ipv4_config         = {}
+  ipv6_block          = {}
+  ipv6_config         = {}
 }
 
 */
diff --git a/examples/pools/iqn_pools.tf b/examples/pools/iqn_pools.tf
@@ -7,6 +7,7 @@ module "iqn_pool" {
   depends_on = [
     data.intersight_organization_organization.org_moid
   ]
+  version          = ">=0.9.6"
   source           = "terraform-cisco-modules/imm/intersight//modules/iqn_pools"
   assignment_order = "sequential"
   description      = "IQN Pool Example."
@@ -16,7 +17,7 @@ module "iqn_pool" {
   tags             = var.tags
   iqn_suffix_blocks = [
     {
-      from   = 01
+      from   = 00
       suffix = "ucs-host"
       size   = 32
       # to     = 31

diff --git a/examples/pools/mac_pools.tf b/examples/pools/mac_pools.tf
@@ -13,6 +13,7 @@ module "mac_pool_a" {
   depends_on = [
     data.intersight_organization_organization.org_moid
   ]
+  version          = ">=0.9.6"
   source           = "terraform-cisco-modules/imm/intersight//modules/mac_pools"
   assignment_order = "sequential"
   description      = "Example A MAC Pool."
@@ -22,7 +23,8 @@ module "mac_pool_a" {
   mac_blocks = [
     {
       from = "00:25:B5:0a:00:00"
-      to   = "00:25:B5:0a:00:fe"
+      size = 256
+      # to   = "00:25:B5:0a:00:ff"
     }
   ]
 }
@@ -31,6 +33,7 @@ module "mac_pool_b" {
   depends_on = [
     data.intersight_organization_organization.org_moid
   ]
+  version          = ">=0.9.6"
   source           = "terraform-cisco-modules/imm/intersight//modules/mac_pools"
   assignment_order = "sequential"
   description      = "Example B MAC Pool."
@@ -40,11 +43,13 @@ module "mac_pool_b" {
   mac_blocks = [
     {
       from = "00:25:B5:0b:00:00"
-      to   = "00:25:B5:0b:00:fe"
+      size = 256
+      # to   = "00:25:B5:0b:00:ff"
     },
     {
       from = "00:25:B5:0c:00:00"
-      to   = "00:25:B5:0c:00:fe"
+      size = 256
+      # to   = "00:25:B5:0c:00:ff"
     }
   ]
 }

diff --git a/examples/pools/uuid_pools.tf b/examples/pools/uuid_pools.tf
@@ -13,20 +13,21 @@ module "uuid_pool" {
   depends_on = [
     data.intersight_organization_organization.org_moid
   ]
-  # source           = "../../modules/uuid_pools"
+  version          = ">=0.9.6"
   source           = "terraform-cisco-modules/imm/intersight//modules/uuid_pools"
   assignment_order = "sequential"
   description      = "Example UUID Pool."
   name             = "uuid_pool"
   org_moid         = local.org_moid
+  prefix           = "000025B5-0000-0000"
   tags             = var.tags
-  uuid_suffix_blocks = [
-    {
+  uuid_suffix_blocks = {
+    "0" = {
       from = "0000-000000000000"
-      size = 32768
-      # to   = "0000-000000000032"
+      size = 1000
+      # to   = "0000-0000000003E7"
     }
-  ]
+  }
 }
 
 #______________________________________________