Merge pull request #844 from netascode/discovery_creds_ext_isn

Added discovery cred support for external and ISN fabrics

Author: juburnet

roles/dtc/common/templates/ndfc_inventory/dc_external_fabric/dc_external_fabric_inventory.j2

@@ -27,6 +27,10 @@
       hostname: {{ switch['name'] }}
       model: {{ pdata['model'] }}
       version: {{ pdata['version'] }}
+{% if switch['poap'].discovery_creds is defined and switch['poap'].discovery_creds %}
+      discovery_username: PLACE_HOLDER_USERNAME
+      discovery_password: PLACE_HOLDER_PASSWORD
+{% endif %}
       config_data:
         modulesModel: {{ pdata['modulesModel'] }}
         gateway: {{ pdata['gateway'] }}
@@ -42,6 +46,10 @@
     - preprovision_serial: {{ switch['poap']['preprovision']['serial_number'] }}
       model: {{  switch['poap']['preprovision']['model'] }}
       version: {{ switch['poap']['preprovision']['version']  }}
+{% if switch['poap'].discovery_creds is defined and switch['poap'].discovery_creds %}
+      discovery_username: PLACE_HOLDER_USERNAME
+      discovery_password: PLACE_HOLDER_PASSWORD
+{% endif %}
       config_data:
         modulesModel: {{ switch['poap']['preprovision']['modulesModel'] }}
         gateway: {{ switch['management']['default_gateway_v4'] | ansible.utils.ipaddr('address') }}/{{ switch['management']['subnet_mask_ipv4'] }}

roles/dtc/common/templates/ndfc_inventory/isn_fabric/isn_fabric_inventory.j2

@@ -26,6 +26,10 @@
       hostname: {{ switch['name'] }}
       model: {{ pdata['model'] }}
       version: {{ pdata['version'] }}
+{% if switch['poap'].discovery_creds is defined and switch['poap'].discovery_creds %}
+      discovery_username: PLACE_HOLDER_USERNAME
+      discovery_password: PLACE_HOLDER_PASSWORD
+{% endif %}
       config_data:
         modulesModel: {{ pdata['modulesModel'] }}
         gateway: {{ pdata['gateway'] }}
@@ -42,6 +46,10 @@
     - preprovision_serial: {{ switch['poap']['preprovision']['serial_number'] }}
       model: {{  switch['poap']['preprovision']['model'] }}
       version: {{ switch['poap']['preprovision']['version']  }}
+{% if switch['poap'].discovery_creds is defined and switch['poap'].discovery_creds %}
+      discovery_username: PLACE_HOLDER_USERNAME
+      discovery_password: PLACE_HOLDER_PASSWORD
+{% endif %}
       config_data:
         modulesModel: {{ switch['poap']['preprovision']['modulesModel'] }}
         gateway: {{ switch['management']['default_gateway_v4'] | ansible.utils.ipaddr('address') }}/{{ switch['management']['subnet_mask_ipv4'] }}