Merge pull request #3 from billdodd/fix/issue-2

Revert playbooks to only use released Ansible 2.8 function

Author: mraineri

OEM_EXTENSIONS.md

@@ -8,7 +8,7 @@ This document describes an approach for extending the standard Redfish Ansible m
 
 ## The Approach
 
-With the current Redfish Ansible support, there are three main modules (`redfish_command.py`, `redfish_config.py` and `redfish_info.py`). These three modules are relatively thin modules that establish the commands and their parameters and then call out to a utility module, `redfish_utils.py`, that has the bulk of the logic to interact with the Redfish services.
+With the current Redfish Ansible support, there are three main modules (`redfish_command.py`, `redfish_config.py` and `redfish_facts.py`). These three modules are relatively thin modules that establish the commands and their parameters and then call out to a utility module, `redfish_utils.py`, that has the bulk of the logic to interact with the Redfish services.
 
 The `redfish_utils.py` module implements a `RedfishUtils` class that has many methods to perform the various Redfish operations. With this architecture, a new vendor module that needs to add a specific Oem feature can create a new class (e.g. `ContosoRedfishUtils`) that extends the existing `RedfishUtils`. New method(s) can be added to that class (or existing methods overridden) while still being able to leverage all the existing standard methods in the parent class. Then a new vendor module (e.g. `contoso_redfish_command.py`) can be written that is basically a sparse version of `redfish_command.py` that only needs to handle the new or changed vendor commands.
 

README.md

@@ -12,6 +12,10 @@ To use these playbooks, you first need to install Ansible (version 2.7 or later;
 
 [Ansible Installation Guide](https://docs.ansible.com/ansible/latest/installation_guide/intro_installation.html)
 
+## Release process
+
+The playbooks in the `master` branch of this repository are designed to work with the [latest stable release of Ansible](https://docs.ansible.com/ansible/latest/reference_appendices/release_and_maintenance.html). The playbooks in the `devel` branch can have new and modified playbooks that reflect new features in the [Ansible devel branch](https://github.com/ansible/ansible/tree/devel).
+
 ## Running the playbooks
 
 1. [Clone](https://help.github.com/en/articles/cloning-a-repository) this repository
@@ -36,9 +40,9 @@ The three Redfish modules are summarized here:
 
 	The `redfish_config` module performs OOB controller operations like setting the BIOS configuration.
 
-3. [redfish_info](https://docs.ansible.com/ansible/devel/modules/redfish_info_module.html) (source: [redfish_info.py](https://github.com/ansible/ansible/blob/devel/lib/ansible/modules/remote_management/redfish/redfish_info.py))
+3. [redfish_facts](https://docs.ansible.com/ansible/latest/modules/redfish_facts_module.html) (source: [redfish_facts.py](https://github.com/ansible/ansible/blob/devel/lib/ansible/modules/remote_management/redfish/redfish_facts.py))
 
-	The `redfish_info` module retrieves information about the OOB controller like Systems inventory and Accounts inventory.
+	The `redfish_facts` module retrieves information about the OOB controller like Systems inventory and Accounts inventory.
 
 All three of the above modules use this utility module: [redfish_utils.py](https://github.com/ansible/ansible/blob/devel/lib/ansible/module_utils/redfish_utils.py)
 

inventory.yml

@@ -21,3 +21,9 @@ rootdir=~/inventory_files
 # Shorter name for inventory_hostname
 # Refers to the logical inventory hostname (example: redfish1)
 host="{{inventory_hostname}}"
+
+# Vars for managing accounts
+id=3
+new_username=user3
+new_password=B1g$3cr3t
+roleid=Operator

playbooks/accounts/add_user.yml

@@ -4,11 +4,6 @@
   name: Add User
   gather_facts: False
 
-  vars:
-  - account_username: user1
-  - account_password: B1g$3cr3t
-  - account_roleid: Operator
-
   tasks:
 
   # When adding a user, it must be enabled afterwards
@@ -19,6 +14,7 @@
       baseuri: "{{ baseuri }}"
       username: "{{ username }}"
       password: "{{ password }}"
-      account_username: "{{ account_username }}"
-      account_password: "{{ account_password }}"
-      account_roleid: "{{ account_roleid }}"
+      id: "{{ id }}"
+      new_username: "{{ new_username }}"
+      new_password: "{{ new_password }}"
+      roleid: "{{ roleid }}"

playbooks/accounts/delete_user.yml

@@ -4,9 +4,6 @@
   name: Delete User
   gather_facts: False
 
-  vars:
-  - account_username: user1
-
   tasks:
 
   - name: Delete user
@@ -16,4 +13,4 @@
       baseuri: "{{ baseuri }}"
       username: "{{ username }}"
       password: "{{ password }}"
-      account_username: "{{ account_username }}"
+      id: "{{ id }}"

playbooks/accounts/disable_user.yml

@@ -4,9 +4,6 @@
   name: Disable User
   gather_facts: False
 
-  vars:
-  - account_username: user1
-
   tasks:
 
   - name: Disable user
@@ -16,4 +13,4 @@
       baseuri: "{{ baseuri }}"
       username: "{{ username }}"
       password: "{{ password }}"
-      account_username: "{{ account_username }}"
+      id: "{{ id }}"

playbooks/accounts/enable_user.yml

@@ -4,9 +4,6 @@
   name: Enable User
   gather_facts: False
 
-  vars:
-  - account_username: user1
-
   tasks:
 
   - name: Enable user
@@ -16,4 +13,4 @@
       baseuri: "{{ baseuri }}"
       username: "{{ username }}"
       password: "{{ password }}"
-      account_username: "{{ account_username }}"
+      id: "{{ id }}"

playbooks/accounts/list_users.yml

@@ -13,7 +13,7 @@
     include_tasks: create_output_file.yml
 
   - name: List all users
-    redfish_info:
+    redfish_facts:
       category: Accounts
       command: ListUsers
       baseuri: "{{ baseuri }}"

playbooks/accounts/update_user_password.yml

@@ -4,10 +4,6 @@
   name: Update user password
   gather_facts: False
 
-  vars:
-  - account_username: user1
-  - account_password: M0re$3cr3t
-
   tasks:
 
   - name: Update user password
@@ -17,5 +13,5 @@
       baseuri: "{{ baseuri }}"
       username: "{{ username }}"
       password: "{{ password }}"
-      account_username: "{{ account_username }}"
-      account_password: "{{ account_password }}"
+      id: "{{ id }}"
+      new_password: "{{ new_password }}"

playbooks/accounts/update_user_role.yml

@@ -4,10 +4,6 @@
   name: Update user role
   gather_facts: False
 
-  vars:
-  - account_username: user1
-  - account_roleid: ReadOnly
-
   tasks:
 
   - name: Update user role
@@ -17,5 +13,5 @@
       baseuri: "{{ baseuri }}"
       username: "{{ username }}"
       password: "{{ password }}"
-      account_username: "{{ account_username }}"
-      account_roleid: "{{ account_roleid }}"
+      id: "{{ id }}"
+      roleid: "{{ roleid }}"