Bump ansible to 1.9.2

Ansible 1.9.2 contains the fix needed for docker-py >1.2.0

This is needed for some gate reasons, but it is also a good version
bump because it fixes a few issues with delegate_to.

Change-Id: Iafbabb3b0232620849d0548c5cd9d8d316c2b0f3
backport: liberty
Partially-Implements: blueprint functional-testing-gate
This commit is contained in:
Sam Yaple 2015-10-13 05:03:36 +00:00
parent bd010bdee2
commit c5be228be8
33 changed files with 1 additions and 79 deletions

View File

@ -1,10 +1,6 @@
---
# The options in this file can be overridden in 'globals.yml'
# Ansible Docker module bug. This can be removed when Ansible 2.0 arrives
# https://github.com/ansible/ansible-modules-core/issues/1227
docker_api_version: "1.18"
# The "temp" files that are created before merge need to stay persistent due
# to the fact that ansible will register a "change" if it has to create them
# again. Persistent files allow for idempotency

View File

@ -37,7 +37,6 @@
- name: Starting Ceph Monitor data container
docker:
docker_api_version: "{{ docker_api_version }}"
net: host
pull: "{{ docker_pull_policy }}"
restart_policy: "{{ docker_restart_policy }}"

View File

@ -7,7 +7,6 @@
- name: Bootstrapping Ceph OSDs
docker:
docker_api_version: "{{ docker_api_version }}"
net: host
pull: "{{ docker_pull_policy }}"
restart_policy: "no"

View File

@ -2,7 +2,6 @@
- name: Generating Initial Ceph keyrings and monmap
docker:
detach: False
docker_api_version: "{{ docker_api_version }}"
net: host
pull: "{{ docker_pull_policy }}"
restart_policy: "no"

View File

@ -1,7 +1,6 @@
---
- name: Starting ceph-mon container
docker:
docker_api_version: "{{ docker_api_version }}"
net: host
pull: "{{ docker_pull_policy }}"
restart_policy: "{{ docker_restart_policy }}"

View File

@ -21,7 +21,6 @@
- name: Starting ceph-osds container
docker:
docker_api_version: "{{ docker_api_version }}"
net: host
pull: "{{ docker_pull_policy }}"
restart_policy: "{{ docker_restart_policy }}"

View File

@ -29,7 +29,6 @@
- name: Starting Cinder data container
docker:
docker_api_version: "{{ docker_api_version }}"
net: host
pull: "{{ docker_pull_policy }}"
restart_policy: "{{ docker_restart_policy }}"
@ -46,7 +45,6 @@
- name: Starting Cinder bootstrap container
docker:
detach: False
docker_api_version: "{{ docker_api_version }}"
net: host
pull: "{{ docker_pull_policy }}"
restart_policy: "no"

View File

@ -1,6 +1,5 @@
- name: Starting Cinder-api container
docker:
docker_api_version: "{{ docker_api_version }}"
net: host
pull: "{{ docker_pull_policy }}"
restart_policy: "{{ docker_restart_policy }}"
@ -21,7 +20,6 @@
- name: Starting Cinder-backup container
docker:
docker_api_version: "{{ docker_api_version }}"
net: host
pull: "{{ docker_pull_policy }}"
restart_policy: "{{ docker_restart_policy }}"
@ -42,7 +40,6 @@
- name: Starting Cinder-scheduler container
docker:
docker_api_version: "{{ docker_api_version }}"
net: host
pull: "{{ docker_pull_policy }}"
restart_policy: "{{ docker_restart_policy }}"
@ -63,7 +60,6 @@
- name: Starting Cinder-volume container
docker:
docker_api_version: "{{ docker_api_version }}"
net: host
pull: "{{ docker_pull_policy }}"
restart_policy: "{{ docker_restart_policy }}"

View File

@ -1,7 +1,6 @@
---
- name: Starting log_data container
docker:
docker_api_version: "{{ docker_api_version }}"
net: host
pull: "{{ docker_pull_policy }}"
restart_policy: "{{ docker_restart_policy }}"
@ -20,7 +19,6 @@
- name: Starting rsyslog container
docker:
docker_api_version: "{{ docker_api_version }}"
net: host
pull: "{{ docker_pull_policy }}"
restart_policy: "{{ docker_restart_policy }}"
@ -43,7 +41,6 @@
- name: Starting Ansible container
docker:
docker_api_version: "{{ docker_api_version }}"
net: host
pull: "{{ docker_pull_policy }}"
restart_policy: "{{ docker_restart_policy }}"

View File

@ -30,7 +30,6 @@
- name: Starting Glance data container
docker:
docker_api_version: "{{ docker_api_version }}"
net: host
pull: "{{ docker_pull_policy }}"
restart_policy: "{{ docker_restart_policy }}"
@ -47,7 +46,6 @@
- name: Starting Glance bootstrap container
docker:
detach: False
docker_api_version: "{{ docker_api_version }}"
net: host
pull: "{{ docker_pull_policy }}"
restart_policy: "no"

View File

@ -1,7 +1,6 @@
---
- name: Starting Glance-registry container
docker:
docker_api_version: "{{ docker_api_version }}"
net: host
pull: "{{ docker_pull_policy }}"
restart_policy: "{{ docker_restart_policy }}"
@ -24,7 +23,6 @@
- name: Starting Glance-api container
docker:
docker_api_version: "{{ docker_api_version }}"
net: host
pull: "{{ docker_pull_policy }}"
restart_policy: "{{ docker_restart_policy }}"

View File

@ -1,7 +1,6 @@
---
- name: Starting keepalived container
docker:
docker_api_version: "{{ docker_api_version }}"
net: host
pull: "{{ docker_pull_policy }}"
restart_policy: "{{ docker_restart_policy }}"
@ -23,7 +22,6 @@
- name: Starting HAProxy container
docker:
docker_api_version: "{{ docker_api_version }}"
net: host
pull: "{{ docker_pull_policy }}"
restart_policy: "{{ docker_restart_policy }}"

View File

@ -30,7 +30,6 @@
- name: Starting Heat bootstrap container
docker:
detach: False
docker_api_version: "{{ docker_api_version }}"
net: host
pull: "{{ docker_pull_policy }}"
restart_policy: "no"

View File

@ -1,7 +1,6 @@
---
- name: Starting heat-api container
docker:
docker_api_version: "{{ docker_api_version }}"
net: host
pull: "{{ docker_pull_policy }}"
restart_policy: "{{ docker_restart_policy }}"
@ -22,7 +21,6 @@
- name: Starting heat-api-cfn container
docker:
docker_api_version: "{{ docker_api_version }}"
net: host
pull: "{{ docker_pull_policy }}"
restart_policy: "{{ docker_restart_policy }}"
@ -43,7 +41,6 @@
- name: Starting heat-engine container
docker:
docker_api_version: "{{ docker_api_version }}"
net: host
pull: "{{ docker_pull_policy }}"
restart_policy: "{{ docker_restart_policy }}"

View File

@ -1,7 +1,6 @@
---
- name: Starting horizon container
docker:
docker_api_version: "{{ docker_api_version }}"
net: host
pull: "{{ docker_pull_policy }}"
restart_policy: "{{ docker_restart_policy }}"

View File

@ -32,7 +32,6 @@
- name: Starting Ironic bootstrap container
docker:
detach: False
docker_api_version: "{{ docker_api_version }}"
net: host
pull: "{{ docker_pull_policy }}"
restart_policy: "no"

View File

@ -1,7 +1,6 @@
---
- name: Starting Ironic-api container
docker:
docker_api_version: "{{ docker_api_version }}"
net: host
pull: "{{ docker_pull_policy }}"
restart_policy: "{{ docker_restart_policy }}"
@ -20,7 +19,6 @@
- name: Starting Ironic-conductor container
docker:
docker_api_version: "{{ docker_api_version }}"
net: host
pull: "{{ docker_pull_policy }}"
restart_policy: "{{ docker_restart_policy }}"
@ -39,7 +37,6 @@
- name: Starting Ironic-discoverd container
docker:
docker_api_version: "{{ docker_api_version }}"
net: host
pull: "{{ docker_pull_policy }}"
restart_policy: "{{ docker_restart_policy }}"
@ -59,7 +56,6 @@
- name: Starting Ironic-pxe container
docker:
docker_api_version: "{{ docker_api_version }}"
net: host
pull: "{{ docker_pull_policy }}"
restart_policy: "{{ docker_restart_policy }}"

View File

@ -32,7 +32,6 @@
- name: Starting Keystone bootstrap container
docker:
detach: False
docker_api_version: "{{ docker_api_version }}"
net: host
pull: "{{ docker_pull_policy }}"
restart_policy: "no"

View File

@ -1,7 +1,6 @@
---
- name: Starting Keystone container
docker:
docker_api_version: "{{ docker_api_version }}"
net: host
pull: "{{ docker_pull_policy }}"
restart_policy: "{{ docker_restart_policy }}"

View File

@ -38,7 +38,6 @@
- name: Starting MariaDB data container
docker:
docker_api_version: "{{ docker_api_version }}"
net: host
pull: "{{ docker_pull_policy }}"
restart_policy: "{{ docker_restart_policy }}"
@ -54,7 +53,6 @@
- name: Starting MariaDB bootstrap container
docker:
docker_api_version: "{{ docker_api_version }}"
net: host
pull: "{{ docker_pull_policy }}"
restart_policy: "no"

View File

@ -1,7 +1,6 @@
---
- name: Starting MariaDB container
docker:
docker_api_version: "{{ docker_api_version }}"
net: host
pull: "{{ docker_pull_policy }}"
restart_policy: "{{ docker_restart_policy }}"

View File

@ -1,7 +1,6 @@
---
- name: Starting memcached container
docker:
docker_api_version: "{{ docker_api_version }}"
net: host
pull: "{{ docker_pull_policy }}"
restart_policy: "{{ docker_restart_policy }}"

View File

@ -31,7 +31,6 @@
- name: Starting Murano bootstrap container
docker:
detach: False
docker_api_version: "{{ docker_api_version }}"
net: host
pull: "{{ docker_pull_policy }}"
restart_policy: "no"

View File

@ -1,7 +1,6 @@
---
- name: Starting Murano-engine container
docker:
docker_api_version: "{{ docker_api_version }}"
net: host
pull: "{{ docker_pull_policy }}"
restart_policy: "{{ docker_restart_policy }}"
@ -23,7 +22,6 @@
- name: Starting Murano-api container
docker:
docker_api_version: "{{ docker_api_version }}"
net: host
pull: "{{ docker_pull_policy }}"
restart_policy: "{{ docker_restart_policy }}"

View File

@ -30,7 +30,6 @@
- name: Starting Neutron bootstrap container
docker:
detach: False
docker_api_version: "{{ docker_api_version }}"
net: host
pull: "{{ docker_pull_policy }}"
restart_policy: "no"

View File

@ -1,7 +1,6 @@
---
- name: Starting Openvswitch-db container
docker:
docker_api_version: "{{ docker_api_version }}"
net: host
pull: "{{ docker_pull_policy }}"
restart_policy: "{{ docker_restart_policy }}"
@ -23,7 +22,6 @@
- name: Starting Openvswitch-vswitchd container
docker:
docker_api_version: "{{ docker_api_version }}"
net: host
pull: "{{ docker_pull_policy }}"
restart_policy: "{{ docker_restart_policy }}"
@ -54,7 +52,6 @@
- name: Starting Neutron-server container
docker:
docker_api_version: "{{ docker_api_version }}"
net: host
pull: "{{ docker_pull_policy }}"
restart_policy: "{{ docker_restart_policy }}"
@ -75,7 +72,6 @@
- name: Starting Neutron-openvswitch-agent container
docker:
docker_api_version: "{{ docker_api_version }}"
net: host
pull: "{{ docker_pull_policy }}"
restart_policy: "{{ docker_restart_policy }}"
@ -100,7 +96,6 @@
- name: Starting Neutron-linuxbridge-agent container
docker:
docker_api_version: "{{ docker_api_version }}"
net: host
pull: "{{ docker_pull_policy }}"
restart_policy: "{{ docker_restart_policy }}"
@ -127,7 +122,6 @@
- name: Starting Neutron-agents container
docker:
docker_api_version: "{{ docker_api_version }}"
net: host
pull: "{{ docker_pull_policy }}"
restart_policy: "{{ docker_restart_policy }}"

View File

@ -29,7 +29,6 @@
- name: Starting Nova data container
docker:
docker_api_version: "{{ docker_api_version }}"
net: host
pull: "{{ docker_pull_policy }}"
restart_policy: "{{ docker_restart_policy }}"
@ -48,7 +47,6 @@
- name: Starting Nova bootstrap container
docker:
detach: False
docker_api_version: "{{ docker_api_version }}"
net: host
pull: "{{ docker_pull_policy }}"
restart_policy: "no"

View File

@ -1,7 +1,6 @@
---
- name: Starting Nova-libvirt container
docker:
docker_api_version: "{{ docker_api_version }}"
net: host
pull: "{{ docker_pull_policy }}"
restart_policy: "{{ docker_restart_policy }}"
@ -28,7 +27,6 @@
- name: Starting Nova-api container
docker:
docker_api_version: "{{ docker_api_version }}"
net: host
pull: "{{ docker_pull_policy }}"
restart_policy: "{{ docker_restart_policy }}"
@ -51,7 +49,6 @@
- name: Starting Nova-conductor container
docker:
docker_api_version: "{{ docker_api_version }}"
net: host
pull: "{{ docker_pull_policy }}"
restart_policy: "{{ docker_restart_policy }}"
@ -72,7 +69,6 @@
- name: Starting Nova-consoleauth container
docker:
docker_api_version: "{{ docker_api_version }}"
net: host
pull: "{{ docker_pull_policy }}"
restart_policy: "{{ docker_restart_policy }}"
@ -93,7 +89,6 @@
- name: Starting Nova-novncproxy container
docker:
docker_api_version: "{{ docker_api_version }}"
net: host
pull: "{{ docker_pull_policy }}"
restart_policy: "{{ docker_restart_policy }}"
@ -114,7 +109,6 @@
- name: Starting Nova-scheduler container
docker:
docker_api_version: "{{ docker_api_version }}"
net: host
pull: "{{ docker_pull_policy }}"
restart_policy: "{{ docker_restart_policy }}"
@ -135,7 +129,6 @@
- name: Starting Nova-compute container
docker:
docker_api_version: "{{ docker_api_version }}"
net: host
pull: "{{ docker_pull_policy }}"
restart_policy: "{{ docker_restart_policy }}"

View File

@ -9,7 +9,6 @@
- name: Starting RabbitMQ data container
docker:
docker_api_version: "{{ docker_api_version }}"
net: host
pull: "{{ docker_pull_policy }}"
restart_policy: "{{ docker_restart_policy }}"
@ -25,7 +24,6 @@
- name: Starting RabbitMQ bootstrap container
docker:
docker_api_version: "{{ docker_api_version }}"
net: host
pull: "{{ docker_pull_policy }}"
restart_policy: "no"

View File

@ -1,7 +1,6 @@
---
- name: Starting RabbitMQ container
docker:
docker_api_version: "{{ docker_api_version }}"
net: host
pull: "{{ docker_pull_policy }}"
restart_policy: "{{ docker_restart_policy }}"

View File

@ -1,7 +1,6 @@
---
- name: Starting Swift data container
docker:
docker_api_version: "{{ docker_api_version }}"
net: host
pull: "{{ docker_pull_policy }}"
restart_policy: "{{ docker_restart_policy }}"

View File

@ -1,7 +1,6 @@
---
- name: Starting Swift-rsyncd container
docker:
docker_api_version: "{{ docker_api_version }}"
net: host
pull: "{{ docker_pull_policy }}"
restart_policy: "{{ docker_restart_policy }}"
@ -23,7 +22,6 @@
- name: Starting Swift Proxy Server container
docker:
docker_api_version: "{{ docker_api_version }}"
net: host
pull: "{{ docker_pull_policy }}"
restart_policy: "{{ docker_restart_policy }}"
@ -47,7 +45,6 @@
- name: Starting Swift Account Server container
docker:
docker_api_version: "{{ docker_api_version }}"
net: host
pull: "{{ docker_pull_policy }}"
restart_policy: "{{ docker_restart_policy }}"
@ -71,7 +68,6 @@
- name: Starting Swift Account Auditor container
docker:
docker_api_version: "{{ docker_api_version }}"
net: host
pull: "{{ docker_pull_policy }}"
restart_policy: "{{ docker_restart_policy }}"
@ -95,7 +91,6 @@
- name: Starting Swift Account Replicator container
docker:
docker_api_version: "{{ docker_api_version }}"
net: host
pull: "{{ docker_pull_policy }}"
restart_policy: "{{ docker_restart_policy }}"
@ -119,7 +114,6 @@
- name: Starting Swift Account Reaper container
docker:
docker_api_version: "{{ docker_api_version }}"
net: host
pull: "{{ docker_pull_policy }}"
restart_policy: "{{ docker_restart_policy }}"
@ -143,7 +137,6 @@
- name: Starting Swift Container Server container
docker:
docker_api_version: "{{ docker_api_version }}"
net: host
pull: "{{ docker_pull_policy }}"
restart_policy: "{{ docker_restart_policy }}"
@ -167,7 +160,6 @@
- name: Starting Swift Container Auditor container
docker:
docker_api_version: "{{ docker_api_version }}"
net: host
pull: "{{ docker_pull_policy }}"
restart_policy: "{{ docker_restart_policy }}"
@ -191,7 +183,6 @@
- name: Starting Swift Container Replicator container
docker:
docker_api_version: "{{ docker_api_version }}"
net: host
pull: "{{ docker_pull_policy }}"
restart_policy: "{{ docker_restart_policy }}"
@ -215,7 +206,6 @@
- name: Starting Swift Container Updater container
docker:
docker_api_version: "{{ docker_api_version }}"
net: host
pull: "{{ docker_pull_policy }}"
restart_policy: "{{ docker_restart_policy }}"
@ -239,7 +229,6 @@
- name: Starting Swift Object Server container
docker:
docker_api_version: "{{ docker_api_version }}"
net: host
pull: "{{ docker_pull_policy }}"
restart_policy: "{{ docker_restart_policy }}"
@ -263,7 +252,6 @@
- name: Starting Swift Object Auditor container
docker:
docker_api_version: "{{ docker_api_version }}"
net: host
pull: "{{ docker_pull_policy }}"
restart_policy: "{{ docker_restart_policy }}"
@ -287,7 +275,6 @@
- name: Starting Swift Object Replicator container
docker:
docker_api_version: "{{ docker_api_version }}"
net: host
pull: "{{ docker_pull_policy }}"
restart_policy: "{{ docker_restart_policy }}"
@ -311,7 +298,6 @@
- name: Starting Swift Object Updater container
docker:
docker_api_version: "{{ docker_api_version }}"
net: host
pull: "{{ docker_pull_policy }}"
restart_policy: "{{ docker_restart_policy }}"
@ -335,7 +321,6 @@
- name: Starting Swift Object Expirer container
docker:
docker_api_version: "{{ docker_api_version }}"
net: host
pull: "{{ docker_pull_policy }}"
restart_policy: "{{ docker_restart_policy }}"

View File

@ -24,7 +24,7 @@ More information on the Ansible inventory file can be found in the Ansible
Prerequisites
-------------
On the deployment host you must have Ansible>=1.8.4 installed. That is
On the deployment host you must have Ansible>=1.9.2 installed. That is
the only requirement for deploying. To build the images locally you must
also have the Python library docker-py>=1.2.0 installed.