Add labels to the fail tasks to clarify output of playbook runs; clean up extraneous whitespace

Author: Tom McSweeney

provision-solr.yml

@@ -22,10 +22,12 @@
           node_map_entries: "{{node_map | selectattr('application', 'equalto', application) | list}}"
       # if more than one node_map entry was found or no matching node_map
       # entries were found, then it's an error
-      - fail:
+      - name: Fail playbook run if multiple solr node_map entries were found
+        fail:
           msg: "Multiple {{application}} node_map entries found"
         when: node_map_entries | length > 1
-      - fail:
+      - name: Fail playbook run if no solr node_map entries were found
+        fail:
           msg: "No {{application}} node_map entries found"
         when: node_map_entries | length == 0
       # build the solr and zookeeper host groups from existing inventory
@@ -49,7 +51,8 @@
       # if an external Zookeeper ensemble (or node) was not found and we're
       # deploying an Solr/Fusion cluster (or multiple matching Solr/Fusion
       # nodes were found), then it's an error
-      - fail:
+      - name: Fail playbook run if cluster deployment and external zookeeper ensemble not found
+        fail:
           msg: "An external Zookeeper ensemble is required for Solr/Fusion cluster deployments"
         when:
           - (num_solr_nodes | int == 0 and node_map_entries.0.count > 1) or num_solr_nodes | int > 1
@@ -58,10 +61,12 @@
       # instances into the target cloud environment, ensuring that there
       # are an appropriately tagged, based on the input tags and the node_map
       # entries for this application
-      - include_role:
+      - name: Launch AWS VMs
+        include_role:
           name: 'aws'
         when: num_solr_nodes | int == 0 and cloud == 'aws'
-      - include_role:
+      - name: Launch OSP VMs
+        include_role:
           name: 'osp'
         when: num_solr_nodes | int == 0 and cloud == 'osp'
       when: cloud is defined and (cloud == 'aws' or cloud == 'osp')

roles/osp/tasks/launch-vms.yml

@@ -260,7 +260,7 @@
 
 # wait_for doesn't work with a proxy, so we need to ssh and check output
 - name: Wait for instances to be accessible via SSH
-  shell: /bin/sleep 20 && /usr/bin/ssh -i "{{ private_keyfile_path }}" "{{ user }}@{{ hostvars[item.server.addresses.private.0['addr']].ansible_host }}" echo DataNexus  
+  shell: /bin/sleep 20 && /usr/bin/ssh -i "{{ private_keyfile_path }}" "{{ user }}@{{ hostvars[item.server.addresses.private.0['addr']].ansible_host }}" echo DataNexus
   register: output
   retries: 4
   delay: 10

roles/preflight/tasks/main.yml

@@ -11,7 +11,7 @@
       dest: "/etc/sysconfig/network-scripts/ifcfg-{{api_iface}}"
       remote_src: True
   - name: Replace the device in the new ifcfg-{{api_iface}} script
-    lineinfile: 
+    lineinfile:
       name: "/etc/sysconfig/network-scripts/ifcfg-{{api_iface}}"
       regexp: '^DEVICE='
       line: 'DEVICE="{{api_iface}}"'
@@ -81,7 +81,7 @@
   - name: Set hostname actively so rebooting is unnecessary
     command: /usr/bin/hostnamectl set-hostname {{application}}-{{uuid.stdout}}
   - name: Set pretty hostname actively so rebooting is unnecessary
-    command: /usr/bin/hostnamectl --pretty set-hostname "{{tenant}} {{application}}"  
+    command: /usr/bin/hostnamectl --pretty set-hostname "{{tenant}} {{application}}"
   - name: Set new hostname in /etc/hostname
     replace:
       path: /etc/hostname