openstack
/
bifrost
Code Issues Proposed changes

Merge "Switch to Ansible 2.6"

This commit is contained in:
Zuul 2018-08-24 13:53:44 +00:00 committed by Gerrit Code Review
parent 7ec8374986 4f0743fa6e
commit 718884a4d6
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
playbooks/roles/bifrost-deploy-nodes-dynamic/tasks/main.yml
View File

@ -78,7 +78,10 @@
timeout: " {{ wait_timeout | default(1800) }}"
when: instance_info is defined and instance_info | to_json != '{}'
- name: "Collect the checksum of the deployment image."
stat: path={{deploy_image}}
stat:
path: "{{ deploy_image }}"
get_checksum: yes
checksum_algorithm: md5
register: test_deploy_image
when: instance_info is not defined or ( instance_info is defined and instance_info | to_json == '{}' )
- name: "Error if deploy_image is not present, and instance_info is not defined"
@ -95,7 +98,7 @@
config_drive: "{{ deploy_url_protocol }}://{{ hostvars[inventory_hostname]['ansible_' + ans_network_interface]['ipv4']['address'] }}:{{ file_url_port }}/configdrive-{{ uuid }}.iso.gz"
instance_info:
image_source: "{{ deploy_url_protocol }}://{{ hostvars[inventory_hostname]['ansible_' + ans_network_interface]['ipv4']['address'] }}:{{ file_url_port }}/{{deploy_image_filename}}"
image_checksum: "{{ test_deploy_image.stat.md5 }}"
image_checksum: "{{ test_deploy_image.stat.checksum }}"
image_disk_format: "qcow2"
root_gb: 10
wait: "{{ wait_for_node_deploy }}"

2
scripts/env-setup.sh
View File

@ -5,7 +5,7 @@ set -eu
# NOTE(pas-ha) the above exports some useful variables like
# $PYTHON , $PIP and $VENV depending on venv install or not
ANSIBLE_PIP_VERSION=${ANSIBLE_PIP_VERSION:-${ANSIBLE_GIT_BRANCH:-stable-2.4}}
ANSIBLE_PIP_VERSION=${ANSIBLE_PIP_VERSION:-${ANSIBLE_GIT_BRANCH:-stable-2.6}}
ANSIBLE_PIP_STRING=$(${PYTHON} $(dirname $0)/ansible-pip-str.py ${ANSIBLE_PIP_VERSION})