Update Ansible version to stable-2.1

Updated the version to be installed to stable-2.1 as well
as updated some of the playbooks that were incorrectly
passing string arguments instead of dictionary arguments
for authentication since Ansible 2.1 has checks that
detect this.

Additionally, updated the task labels used for unsetting
authentiction parameters to be more consistent with the
state of the code.

Change-Id: I8c50cd2a722f2c8fee91fb6ef0761969dd3da138
This commit is contained in:
Julia Kreger 2016-09-27 21:34:27 +00:00
parent 675effac14
commit 2c60745fba
7 changed files with 20 additions and 9 deletions

View File

@ -17,9 +17,10 @@
# the pass-through could mean that the user could deploy # the pass-through could mean that the user could deploy
# things that are not directly accessible or reasonable # things that are not directly accessible or reasonable
# to be inspected. # to be inspected.
- name: "If in noauth mode, set Auth parameters to None" - name: "If in noauth mode, unset authentication parameters."
set_fact: set_fact:
auth_type: None auth_type: None
auth: {}
when: noauth_mode | bool == true when: noauth_mode | bool == true
- name: "Setup DHCP for nodes." - name: "Setup DHCP for nodes."
template: template:

View File

@ -12,10 +12,10 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
--- ---
- name: "If in noauth mode, set Auth parameters to None" - name: "If in noauth mode, unset authentication parameters."
set_fact: set_fact:
auth_type: None auth_type: None
auth: None auth: {}
when: noauth_mode | bool == true when: noauth_mode | bool == true
- name: "Unprovision node" - name: "Unprovision node"
os_ironic_node: os_ironic_node:

View File

@ -12,10 +12,10 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
--- ---
- name: "If in noauth mode, set Auth parameters to None" - name: "If in noauth mode, unset authentication parameters."
set_fact: set_fact:
auth_type: None auth_type: None
auth: None auth: {}
when: noauth_mode | bool == true when: noauth_mode | bool == true
- name: "Delete hardware" - name: "Delete hardware"
os_ironic: os_ironic:

View File

@ -12,9 +12,10 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
--- ---
- name: "If in noauth mode, set Auth parameters to None" - name: "If in noauth mode, unset authentication parameters."
set_fact: set_fact:
auth_type: None auth_type: None
auth: {}
when: noauth_mode | bool == true when: noauth_mode | bool == true
- name: "Dynamic enrollment" - name: "Dynamic enrollment"
os_ironic: os_ironic:

View File

@ -12,10 +12,10 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
--- ---
- name: "If in noauth mode, set Auth parameters to None" - name: "If in noauth mode, unset authentication parameters."
set_fact: set_fact:
auth_type: None auth_type: None
auth: None auth: {}
when: noauth_mode | bool == true when: noauth_mode | bool == true
- name: "Execute node introspection - NoAuth Mode" - name: "Execute node introspection - NoAuth Mode"
os_ironic_inspect: os_ironic_inspect:

View File

@ -0,0 +1,9 @@
---
features:
- Bifrost has been updated to utilize Ansible 2.1's stable branch
for the version of ansible installed.
upgrade:
- Bifrost has been changed to utilize Ansible 2.1 by default.
Should a deployment encounter issues with Ansible, they may
wish to check/update their version of Ansible, or re-execute
the env-setup.sh script.

View File

@ -2,7 +2,7 @@
set -eu set -eu
ANSIBLE_GIT_URL=${ANSIBLE_GIT_URL:-https://github.com/ansible/ansible.git} ANSIBLE_GIT_URL=${ANSIBLE_GIT_URL:-https://github.com/ansible/ansible.git}
ANSIBLE_GIT_BRANCH=${ANSIBLE_GIT_BRANCH:-stable-2.0} ANSIBLE_GIT_BRANCH=${ANSIBLE_GIT_BRANCH:-stable-2.1}
ANSIBLE_INSTALL_ROOT=${ANSIBLE_INSTALL_ROOT:-/opt/stack} ANSIBLE_INSTALL_ROOT=${ANSIBLE_INSTALL_ROOT:-/opt/stack}
function check_get_module () { function check_get_module () {