Merge pull request #202 from HewlettPackard/automation

Automation

roles/oneview_appliance_device_snmp_v3_trap_destination_facts/tasks/main.yml

@@ -47,7 +47,7 @@
     sessionID: "{{ session.ansible_facts.session }}"
     uri: "{{ appliance_device_snmp_v3_trap_destinations['uri'] }}"
   delegate_to: localhost
-  when: appliance_device_snmp_v3_trap_destinations is True
+  when: appliance_device_snmp_v3_trap_destinations is defined
 
 - debug:
     var: appliance_device_snmp_v3_trap_destinations

roles/oneview_enclosure_facts/tasks/main.yml

@@ -50,7 +50,7 @@
   oneview_enclosure_facts:
     config: "{{ config }}"
     sessionID: "{{ session.ansible_facts.session }}"
-    name: "{{ contents.enclosure.name }}"
+    name: "{{ contents.enclosure.enclosure_name }}"
   delegate_to: localhost
 
 - debug: var=enclosures
@@ -60,16 +60,16 @@
   oneview_enclosure_facts:
     config: "{{ config }}"
     sessionID: "{{ session.ansible_facts.session }}"
-    name: "{{ contents.enclosure.name }}"
+    name: "{{ contents.enclosure.enclosure_name }}"
     options:
       - script
-  when: contents.variant == 'C7000' or currentVersion == '300'
+  when: contents.enclosure.variant == 'C7000' or currentVersion == '300'
   delegate_to: localhost 
 
 - name: Gather facts about an Enclosure by name with options
   oneview_enclosure_facts:
     config: "{{ config }}"
-    name: "{{ contents.enclosure.name }}"
+    name: "{{ contents.enclosure.enclosure_name }}"
     sessionID: "{{ session.ansible_facts.session }}"
     options:
       - environmentalConfiguration   # optional

roles/oneview_server_hardware/defaults/main.yml

@@ -1,4 +1,4 @@
 ---
 # defaults file for oneview_server_hardware
 config: "~/.ansible/collections/ansible_collections/hpe/oneview/roles/oneview_server_hardware/files/oneview_config.json"
-contents: "{{lookup('file', config)}}"
+contents: "{{lookup('file', '../config/config.json') | from_json}}"

roles/oneview_server_hardware/tasks/main.yml

@@ -29,7 +29,7 @@
           initialScopeUris: 
           - "{{ scopes[0]['uri'] }}" #Supported only with OneView API version >= 600.
   delegate_to: localhost
-  when: variant == 'C7000'
+  when: contents.server_hardware.variant == 'C7000'
 
 - name: Do nothing when the server hardware is already present
   oneview_server_hardware:
@@ -44,7 +44,7 @@
           licensingIntent: "OneView"
           configurationState: "Managed"
   delegate_to: localhost
-  when: variant == 'C7000'
+  when: contents.server_hardware.variant == 'C7000'
 
 #This task available only with OneView API version >= 600.
 - name: Add multiple rack-mount servers
@@ -61,7 +61,7 @@
           licensingIntent: "OneView"
           configurationState: "Managed"
   delegate_to: localhost
-  when: variant == 'C7000'
+  when: contents.server_hardware.variant == 'C7000'
 
 - name: Gather facts about all Server Hardwares
   oneview_server_hardware_facts:
@@ -189,7 +189,7 @@
     data:
         name: "{{ contents.server_hardware.server_hardware_hostname }}"
   delegate_to: localhost
-  when: variant == 'C7000'
+  when: contents.server_hardware.variant == 'C7000'
 
 - name: Do nothing when the server hardware is already removed
   oneview_server_hardware:
@@ -199,4 +199,4 @@
     data:
         name: "{{ contents.server_hardware.server_hardware_hostname }}"
   delegate_to: localhost
-  when: variant == 'C7000'
+  when: contents.server_hardware.variant == 'C7000'

roles/oneview_user/tasks/main.yml

@@ -76,17 +76,6 @@
       newPassword: "{{ contents.users.newpassword }}"
   delegate_to: localhost
 
-- name: Change the User's password during first-time setup
-  oneview_user:
-    config: "{{ config }}"
-    sessionID: "{{ session.ansible_facts.session }}"
-    state: set_password
-    data:
-      userName: "{{ contents.users.user_name }}"
-      oldPassword: "myPass1234"
-      newPassword: "{{ contents.users.newPassword }}"
-  delegate_to: localhost
-
 - name: Adds multiple new local users to the appliance
   oneview_user:
     config: "{{ config }}"