Add bool() to control config-deploy and config-save, more...

Added config_deploy_for_existing_device bool() to the when: conditional for config-save and config-deploy tasks.  This may not be needed, but wanted to give use control over when these REST calls are made.

Also, removed items from vars_dict for config-save since this REST call does not require anything in vars_dict payload.

Author: allenrobel

roles/ndfc_device_merged/README.md

@@ -8,6 +8,8 @@ Variable        | Type  | Description
 ----------------|-------|----------------------------------------
 device_name     | str() | The device to be merged
 fabric_name     | str() | The fabric in which ``device_name`` resides
+config_deploy_for_existing_device | bool() | Default: ``true``. Determines whether to skip config-save + config-deploy if the device already exists in the topology.  If set to ``false``, the config-save and config-deploy tasks will be skipped if the device already exists.  If set to ``true``, the tasks will run unconditionally (i.e. regardless whether the device exists or not).
+
 
 Device and Fabric names are defined in the following file:
 
@@ -23,9 +25,11 @@ From ``./roles/ndfc_devices_merged/defaults/main.yml``:
 
 Variable        | Type   | Description
 ----------------|--------|------------
-auth_proto      | str()  | the protocol to use to authenticate to each device.  We assume all devices use the same protocol
-max_hops        | int()  | the number of CDP hops to traverse when discovering devices. We set this to 0 to discover one device at a time
+auth_proto      | str()  | The protocol to use to authenticate to each device.  We assume all devices use the same protocol.
+max_hops        | int()  | The number of CDP hops to traverse when discovering devices. We set this to 0 to discover one device at a time.
 preserve_config | bool() | If true, preserve the existing config on the device(s).  If false, do not preserve the configs.
+forceShowRun    | bool() | Default: ``false`` Included in the config-deploy REST call payload.
+inclAllMSDSwitches | bool() | Default: ``false`` Included in the config-deploy REST call payload.
 
 From ``./inventory/group_vars/ndfc``:
 

roles/ndfc_device_merged/defaults/main.yml

@@ -1,6 +1,13 @@
 # ndfc_devices_create/defaults/main.yml
 auth_proto: MD5
 max_hops: 0
-preserve_config: False
+preserve_config: false
 forceShowRun: false
 inclAllMSDSwitches: false
+# config_deploy_for_existing_device determines whether to skip
+# config-save + config-deploy if the device already 
+# exists in the topology.  If set to false, the tasks will 
+# be skipped if the device already exists.  If set to true,
+# all tasks will run unconditionally (i.e. regardless whether
+# the device exists or not).
+config_deploy_for_existing_device: true

roles/ndfc_device_merged/tasks/worker.yml

@@ -7,8 +7,8 @@
     - seed_ip: "{{ item.ip }}"
   register: result
 
-# serial is used below to skip device creation if the
-# device already exists
+# serial is used below to skip REST calls to config-save 
+# and config-deploy if the device already exists
 - name: worker set_fact device serial number
   set_fact:
     serial: "{{ result.response | json_query(q2) }}"
@@ -26,8 +26,7 @@
       password: "{{ device_password }}"
       max_hops: "{{ max_hops }}"
       role: "{{ item.role }}"
-      preserve_config: "{{ preserve_config }}" 
-  when: "serial == ''"
+      preserve_config: "{{ preserve_config }}"
 
 - name: worker REST POST config-save FABRIC {{ fabric_name }}
   cisco.dcnm.dcnm_rest:
@@ -36,9 +35,8 @@
     json_data: "{{ vars_dict | to_json }}"
   vars:
     vars_dict:
-      forceShowRun: "{{ forceShowRun }}"
-      inclAllMSDSwitches: "{{ inclAllMSDSwitches }}"
-  when: "serial == ''"
+  when: "serial == '' or config_deploy_for_existing_device == true"
+
 - name: worker REST POST config-deploy FABRIC {{ fabric_name }}
   cisco.dcnm.dcnm_rest:
     method: POST
@@ -48,4 +46,4 @@
     vars_dict:
       forceShowRun: "{{ forceShowRun }}"
       inclAllMSDSwitches: "{{ inclAllMSDSwitches }}"
-  when: "serial == ''"
+  when: "serial == '' or config_deploy_for_existing_device == true"