Development1704 (#7)

* add redeploy to template

* add support for multple interfaces under l3_handoffs

* update changelog

* fix fabric_role in border

* add time sleep to provision_device

Author: kuba-mazurkiewicz

CHANGELOG.md

@@ -1,5 +1,9 @@
 ## 0.0.3-beta1 (unreleased)
 
+- BREAKING CHANGE: add support for multple interfaces under l3_handoffs
+- Add redeploy option to templates
+- Add non fabric device provisioning
+- Update banner settings to use allow banner settings to be assigned to Global area
 - BREAKING CHANGE: rename `catalystcenter_fabric_port_assignment` to `catalystcenter_fabric_port_assignments`
 - Fix issue with assiging same L3 VN to multiple fabric_sites
 - Removed `network_profile` dependencies for deploying templates

README.md

@@ -123,6 +123,7 @@ module "catalystcenter" {
 | [catalystcenter_wireless_ssid.ssid](https://registry.terraform.io/providers/CiscoDevNet/catalystcenter/latest/docs/resources/wireless_ssid) | resource |
 | [local_sensitive_file.defaults](https://registry.terraform.io/providers/hashicorp/local/latest/docs/resources/sensitive_file) | resource |
 | [terraform_data.validation](https://registry.terraform.io/providers/hashicorp/terraform/latest/docs/resources/data) | resource |
+| [time_sleep.provision_device_wait](https://registry.terraform.io/providers/hashicorp/time/latest/docs/resources/sleep) | resource |
 | [time_sleep.template_wait](https://registry.terraform.io/providers/hashicorp/time/latest/docs/resources/sleep) | resource |
 | [catalystcenter_area.global](https://registry.terraform.io/providers/CiscoDevNet/catalystcenter/latest/docs/data-sources/area) | data source |
 | [catalystcenter_credentials_cli.cli_credentials](https://registry.terraform.io/providers/CiscoDevNet/catalystcenter/latest/docs/data-sources/credentials_cli) | data source |

cc_device_provision.tf

@@ -24,21 +24,23 @@ locals {
   l3_handoffs_ip_transit = flatten([
     for border_device in try(local.catalyst_center.fabric.border_devices, []) : [
       for transit in try(border_device.l3_handoffs, []) : [
-        for vn in try(transit.virtual_networks) : {
-          key                   = format("%s/%s/%s", vn.name, border_device.name, transit.name)
-          transit_name          = try(transit.name, null)
-          device_name           = try(border_device.name, null)
-          device_ip             = try(local.all_devices[border_device.name].device_ip, null)
-          interface_name        = try(transit.interface_name, null)
-          virtual_network_name  = try(vn.name, null)
-          vlan_id               = try(vn.vlan, null)
-          local_ip_address      = try(vn.local_ip_address, null)
-          local_ipv6_address    = try(vn.local_ipv6_address, null)
-          peer_ipv6_address     = try(vn.peer_ipv6_address, null)
-          peer_ip_address       = try(vn.peer_ip_address, null)
-          tcp_mss_adjustment    = try(vn.tcp_mss_adjustment, null)
-          external_handoff_pool = try(border_device.external_handoff_pool, null)
-        }
+        for interface in try(transit.interfaces, []) : [
+          for vn in try(interface.virtual_networks) : {
+            key                   = format("%s/%s/%s/%s", vn.name, interface.name, transit.name, border_device.name)
+            transit_name          = try(transit.name, null)
+            device_name           = try(border_device.name, null)
+            device_ip             = try(local.all_devices[border_device.name].device_ip, null)
+            interface_name        = try(interface.name, null)
+            virtual_network_name  = try(vn.name, null)
+            vlan_id               = try(vn.vlan, null)
+            local_ip_address      = try(vn.local_ip_address, null)
+            local_ipv6_address    = try(vn.local_ipv6_address, null)
+            peer_ipv6_address     = try(vn.peer_ipv6_address, null)
+            peer_ip_address       = try(vn.peer_ip_address, null)
+            tcp_mss_adjustment    = try(vn.tcp_mss_adjustment, null)
+            external_handoff_pool = try(border_device.external_handoff_pool, null)
+          }
+        ]
       ]
     ]
   ])
@@ -61,6 +63,10 @@ locals {
   l2_handoff_vlan_id_map = {
     for item in local.anycast_gateways : item.vlan_name => catalystcenter_anycast_gateway.anycast_gateway[item.name].vlan_id if try(item.vlan_name, null) != null
   }
+
+  provisioned_devices = [
+    for device in try(local.catalyst_center.inventory.devices, []) : device if strcontains(device.state, "PROVISION")
+  ]
 }
 
 data "catalystcenter_network_devices" "all_devices" {
@@ -88,7 +94,7 @@ resource "catalystcenter_fabric_provision_device" "non_fabric_device" {
 }
 
 resource "catalystcenter_fabric_provision_device" "border_device" {
-  for_each = { for device in try(local.catalyst_center.inventory.devices, []) : device.name => device if strcontains(device.state, "PROVISION") && device.device_role == "BORDER ROUTER" }
+  for_each = { for device in try(local.catalyst_center.inventory.devices, []) : device.name => device if strcontains(device.state, "PROVISION") && device.device_role == "BORDER ROUTER" && try(device.fabric_roles, null) != null }
 
   site_id           = try(local.site_id_list[each.value.site], null)
   network_device_id = lookup(local.device_ip_to_id, each.value.device_ip, "")
@@ -225,5 +231,13 @@ resource "catalystcenter_fabric_port_assignments" "port_assignments" {
   network_device_id = try(local.device_ip_to_id[each.value.device_ip], "")
   port_assignments  = try(local.device_port_assignments[each.key], null)
 
-  depends_on = [catalystcenter_fabric_device.edge_device, catalystcenter_fabric_device.border_device, catalystcenter_fabric_provision_device.edge_device, catalystcenter_fabric_provision_device.edge_device, catalystcenter_anycast_gateway.anycast_gateway]
+  depends_on = [catalystcenter_fabric_device.edge_device, catalystcenter_fabric_device.border_device, catalystcenter_fabric_provision_device.edge_device, catalystcenter_anycast_gateway.anycast_gateway]
 }
+
+resource "time_sleep" "provision_device_wait" {
+  count = length(try(local.provisioned_devices, [])) > 0 ? 1 : 0
+
+  create_duration = "10s"
+
+  depends_on = [catalystcenter_fabric_provision_device.edge_device, catalystcenter_wireless_device_provision.wireless_controller, catalystcenter_fabric_provision_device.non_fabric_device, catalystcenter_fabric_provision_device.border_device]
+}

cc_templates.tf

@@ -57,13 +57,13 @@ locals {
 
   combined_templates = flatten([
     for device in try(local.catalyst_center.inventory.devices, []) : [
-      for template in try(device.dayn_templates.regular, []) : [
+      for template in concat(try(device.dayn_templates.regular, []), try(device.dayn_templates.composite, [])) : [
         {
           "template" : try(template.name, null),
           "name" : try(device.name, null),
           "state" : try(device.state, null),
           "device_ip" : try(device.device_ip, null)
-          "deploy" : try(template.deploy, false)
+          "deploy_state" : try(template.state, null)
         }
       ]
     ]
@@ -187,8 +187,9 @@ resource "catalystcenter_template_version" "composite_commit_version" {
 }
 
 resource "catalystcenter_deploy_template" "regular_template_deploy" {
-  for_each = { for d in try(local.combined_templates, []) : "${d.name}#_#${d.template}" => d if try(local.templates_map[d.template].composite, false) == false && local.templates_map[d.template].template_type == "dayn" && strcontains(d.state, "PROVISION") && try(d.deploy, false) == true }
+  for_each = { for d in try(local.combined_templates, []) : "${d.name}#_#${d.template}" => d if try(local.templates_map[d.template].composite, false) == false && local.templates_map[d.template].template_type == "dayn" && strcontains(d.state, "PROVISION") && strcontains(d.deploy_state, "DEPLOY") }
 
+  redeploy            = try(each.value.deploy_state, null) == "REDEPLOY" ? true : false
   template_id         = catalystcenter_template.regular_template[each.value.template].id
   force_push_template = try(local.templates_map[each.value.template].force_push_template, local.defaults.catalyst_center.templates.force_push_template, null)
   is_composite        = false
@@ -211,12 +212,13 @@ resource "catalystcenter_deploy_template" "regular_template_deploy" {
     }
   ]
 
-  depends_on = [catalystcenter_device_role.role, catalystcenter_fabric_provision_device.edge_device, catalystcenter_fabric_provision_device.border_device, catalystcenter_fabric_provision_device.non_fabric_device]
+  depends_on = [catalystcenter_device_role.role, catalystcenter_fabric_provision_device.edge_device, catalystcenter_fabric_provision_device.border_device, catalystcenter_fabric_provision_device.non_fabric_device, time_sleep.provision_device_wait]
 }
 
 resource "catalystcenter_deploy_template" "composite_template_deploy" {
-  for_each = { for d in try(local.combined_templates, []) : "${d.name}#_#${d.template}" => d if try(local.templates_map[d.template].composite, false) == true && local.templates_map[d.template].template_type == "dayn" && strcontains(d.state, "PROVISION") && try(d.deploy, false) == true }
+  for_each = { for d in try(local.combined_templates, []) : "${d.name}#_#${d.template}" => d if try(local.templates_map[d.template].composite, false) == true && local.templates_map[d.template].template_type == "dayn" && strcontains(d.state, "PROVISION") && strcontains(d.deploy_state, "DEPLOY") }
 
+  redeploy            = try(each.value.deploy_state, null) == "REDEPLOY" ? true : false
   template_id         = catalystcenter_template_version.composite_commit_version[each.value.template].id
   main_template_id    = catalystcenter_template.composite_template[each.value.template].id
   force_push_template = try(local.templates_map[each.value.template].force_push_template, local.defaults.catalyst_center.templates.force_push_template, null)
@@ -261,5 +263,5 @@ resource "catalystcenter_deploy_template" "composite_template_deploy" {
     }
   ]
 
-  depends_on = [catalystcenter_device_role.role, catalystcenter_fabric_provision_device.edge_device, catalystcenter_fabric_provision_device.border_device, catalystcenter_fabric_provision_device.non_fabric_device]
+  depends_on = [catalystcenter_device_role.role, catalystcenter_fabric_provision_device.edge_device, catalystcenter_fabric_provision_device.border_device, catalystcenter_fabric_provision_device.non_fabric_device, time_sleep.provision_device_wait]
 }