From c5be228be843222e9c9f2be36b92659ada3e25a8 Mon Sep 17 00:00:00 2001 From: Sam Yaple Date: Tue, 13 Oct 2015 05:03:36 +0000 Subject: [PATCH] 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 --- ansible/group_vars/all.yml | 4 ---- ansible/roles/ceph/tasks/bootstrap_mons.yml | 1 - ansible/roles/ceph/tasks/bootstrap_osds.yml | 1 - ansible/roles/ceph/tasks/generate_cluster.yml | 1 - ansible/roles/ceph/tasks/start_mons.yml | 1 - ansible/roles/ceph/tasks/start_osds.yml | 1 - ansible/roles/cinder/tasks/bootstrap.yml | 2 -- ansible/roles/cinder/tasks/start.yml | 4 ---- ansible/roles/common/tasks/start.yml | 3 --- ansible/roles/glance/tasks/bootstrap.yml | 2 -- ansible/roles/glance/tasks/start.yml | 2 -- ansible/roles/haproxy/tasks/start.yml | 2 -- ansible/roles/heat/tasks/bootstrap.yml | 1 - ansible/roles/heat/tasks/start.yml | 3 --- ansible/roles/horizon/tasks/start.yml | 1 - ansible/roles/ironic/tasks/bootstrap.yml | 1 - ansible/roles/ironic/tasks/start.yml | 4 ---- ansible/roles/keystone/tasks/bootstrap.yml | 1 - ansible/roles/keystone/tasks/start.yml | 1 - ansible/roles/mariadb/tasks/bootstrap.yml | 2 -- ansible/roles/mariadb/tasks/start.yml | 1 - ansible/roles/memcached/tasks/start.yml | 1 - ansible/roles/murano/tasks/bootstrap.yml | 1 - ansible/roles/murano/tasks/start.yml | 2 -- ansible/roles/neutron/tasks/bootstrap.yml | 1 - ansible/roles/neutron/tasks/start.yml | 6 ------ ansible/roles/nova/tasks/bootstrap.yml | 2 -- ansible/roles/nova/tasks/start.yml | 7 ------- ansible/roles/rabbitmq/tasks/bootstrap.yml | 2 -- ansible/roles/rabbitmq/tasks/start.yml | 1 - ansible/roles/swift/tasks/bootstrap.yml | 1 - ansible/roles/swift/tasks/start.yml | 15 --------------- doc/ansible-deployment.rst | 2 +- 33 files changed, 1 insertion(+), 79 deletions(-) diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml index 4add08a1b4..76dba6f08b 100644 --- a/ansible/group_vars/all.yml +++ b/ansible/group_vars/all.yml @@ -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 diff --git a/ansible/roles/ceph/tasks/bootstrap_mons.yml b/ansible/roles/ceph/tasks/bootstrap_mons.yml index 853056b885..0b585e6f8c 100644 --- a/ansible/roles/ceph/tasks/bootstrap_mons.yml +++ b/ansible/roles/ceph/tasks/bootstrap_mons.yml @@ -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 }}" diff --git a/ansible/roles/ceph/tasks/bootstrap_osds.yml b/ansible/roles/ceph/tasks/bootstrap_osds.yml index 3e2095008d..a01c79e58c 100644 --- a/ansible/roles/ceph/tasks/bootstrap_osds.yml +++ b/ansible/roles/ceph/tasks/bootstrap_osds.yml @@ -7,7 +7,6 @@ - name: Bootstrapping Ceph OSDs docker: - docker_api_version: "{{ docker_api_version }}" net: host pull: "{{ docker_pull_policy }}" restart_policy: "no" diff --git a/ansible/roles/ceph/tasks/generate_cluster.yml b/ansible/roles/ceph/tasks/generate_cluster.yml index 4f51dd3641..2eaf98b023 100644 --- a/ansible/roles/ceph/tasks/generate_cluster.yml +++ b/ansible/roles/ceph/tasks/generate_cluster.yml @@ -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" diff --git a/ansible/roles/ceph/tasks/start_mons.yml b/ansible/roles/ceph/tasks/start_mons.yml index 8e2e44402b..e93fc2cdaf 100644 --- a/ansible/roles/ceph/tasks/start_mons.yml +++ b/ansible/roles/ceph/tasks/start_mons.yml @@ -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 }}" diff --git a/ansible/roles/ceph/tasks/start_osds.yml b/ansible/roles/ceph/tasks/start_osds.yml index 37011f3555..bb20c913bb 100644 --- a/ansible/roles/ceph/tasks/start_osds.yml +++ b/ansible/roles/ceph/tasks/start_osds.yml @@ -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 }}" diff --git a/ansible/roles/cinder/tasks/bootstrap.yml b/ansible/roles/cinder/tasks/bootstrap.yml index 18960731b7..2547f072e3 100644 --- a/ansible/roles/cinder/tasks/bootstrap.yml +++ b/ansible/roles/cinder/tasks/bootstrap.yml @@ -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" diff --git a/ansible/roles/cinder/tasks/start.yml b/ansible/roles/cinder/tasks/start.yml index d75c901805..073e78d296 100644 --- a/ansible/roles/cinder/tasks/start.yml +++ b/ansible/roles/cinder/tasks/start.yml @@ -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 }}" diff --git a/ansible/roles/common/tasks/start.yml b/ansible/roles/common/tasks/start.yml index 38bf9d4ed5..b90a3456a8 100755 --- a/ansible/roles/common/tasks/start.yml +++ b/ansible/roles/common/tasks/start.yml @@ -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 }}" diff --git a/ansible/roles/glance/tasks/bootstrap.yml b/ansible/roles/glance/tasks/bootstrap.yml index 03bddaf34f..4441763906 100644 --- a/ansible/roles/glance/tasks/bootstrap.yml +++ b/ansible/roles/glance/tasks/bootstrap.yml @@ -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" diff --git a/ansible/roles/glance/tasks/start.yml b/ansible/roles/glance/tasks/start.yml index 6776261cbe..c36d9dad9c 100644 --- a/ansible/roles/glance/tasks/start.yml +++ b/ansible/roles/glance/tasks/start.yml @@ -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 }}" diff --git a/ansible/roles/haproxy/tasks/start.yml b/ansible/roles/haproxy/tasks/start.yml index 5e569e3573..fbed919d25 100755 --- a/ansible/roles/haproxy/tasks/start.yml +++ b/ansible/roles/haproxy/tasks/start.yml @@ -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 }}" diff --git a/ansible/roles/heat/tasks/bootstrap.yml b/ansible/roles/heat/tasks/bootstrap.yml index c633993b57..5c2a601cdf 100644 --- a/ansible/roles/heat/tasks/bootstrap.yml +++ b/ansible/roles/heat/tasks/bootstrap.yml @@ -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" diff --git a/ansible/roles/heat/tasks/start.yml b/ansible/roles/heat/tasks/start.yml index d534539edd..8b417b098e 100644 --- a/ansible/roles/heat/tasks/start.yml +++ b/ansible/roles/heat/tasks/start.yml @@ -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 }}" diff --git a/ansible/roles/horizon/tasks/start.yml b/ansible/roles/horizon/tasks/start.yml index 462e1a0abd..924a4ffeb1 100644 --- a/ansible/roles/horizon/tasks/start.yml +++ b/ansible/roles/horizon/tasks/start.yml @@ -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 }}" diff --git a/ansible/roles/ironic/tasks/bootstrap.yml b/ansible/roles/ironic/tasks/bootstrap.yml index 8034cb4b64..4b200bc2b4 100644 --- a/ansible/roles/ironic/tasks/bootstrap.yml +++ b/ansible/roles/ironic/tasks/bootstrap.yml @@ -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" diff --git a/ansible/roles/ironic/tasks/start.yml b/ansible/roles/ironic/tasks/start.yml index c1af84387b..aa08ca637b 100644 --- a/ansible/roles/ironic/tasks/start.yml +++ b/ansible/roles/ironic/tasks/start.yml @@ -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 }}" diff --git a/ansible/roles/keystone/tasks/bootstrap.yml b/ansible/roles/keystone/tasks/bootstrap.yml index 30fcfad2b5..91287c546e 100644 --- a/ansible/roles/keystone/tasks/bootstrap.yml +++ b/ansible/roles/keystone/tasks/bootstrap.yml @@ -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" diff --git a/ansible/roles/keystone/tasks/start.yml b/ansible/roles/keystone/tasks/start.yml index f6241c4e44..ea0b9c26b1 100644 --- a/ansible/roles/keystone/tasks/start.yml +++ b/ansible/roles/keystone/tasks/start.yml @@ -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 }}" diff --git a/ansible/roles/mariadb/tasks/bootstrap.yml b/ansible/roles/mariadb/tasks/bootstrap.yml index 4a356bd164..b126eb5906 100644 --- a/ansible/roles/mariadb/tasks/bootstrap.yml +++ b/ansible/roles/mariadb/tasks/bootstrap.yml @@ -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" diff --git a/ansible/roles/mariadb/tasks/start.yml b/ansible/roles/mariadb/tasks/start.yml index ba07d85c7b..d887c21fbf 100644 --- a/ansible/roles/mariadb/tasks/start.yml +++ b/ansible/roles/mariadb/tasks/start.yml @@ -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 }}" diff --git a/ansible/roles/memcached/tasks/start.yml b/ansible/roles/memcached/tasks/start.yml index 29b3c105b8..61815c171e 100644 --- a/ansible/roles/memcached/tasks/start.yml +++ b/ansible/roles/memcached/tasks/start.yml @@ -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 }}" diff --git a/ansible/roles/murano/tasks/bootstrap.yml b/ansible/roles/murano/tasks/bootstrap.yml index b53cb7c844..2e89f1beef 100644 --- a/ansible/roles/murano/tasks/bootstrap.yml +++ b/ansible/roles/murano/tasks/bootstrap.yml @@ -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" diff --git a/ansible/roles/murano/tasks/start.yml b/ansible/roles/murano/tasks/start.yml index 098ebacbf5..df3edd0c02 100644 --- a/ansible/roles/murano/tasks/start.yml +++ b/ansible/roles/murano/tasks/start.yml @@ -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 }}" diff --git a/ansible/roles/neutron/tasks/bootstrap.yml b/ansible/roles/neutron/tasks/bootstrap.yml index 398018de49..da17bd92f5 100644 --- a/ansible/roles/neutron/tasks/bootstrap.yml +++ b/ansible/roles/neutron/tasks/bootstrap.yml @@ -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" diff --git a/ansible/roles/neutron/tasks/start.yml b/ansible/roles/neutron/tasks/start.yml index 037a323de2..bc884a33fc 100644 --- a/ansible/roles/neutron/tasks/start.yml +++ b/ansible/roles/neutron/tasks/start.yml @@ -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 }}" diff --git a/ansible/roles/nova/tasks/bootstrap.yml b/ansible/roles/nova/tasks/bootstrap.yml index bd2b37f9f7..89625c0d7a 100644 --- a/ansible/roles/nova/tasks/bootstrap.yml +++ b/ansible/roles/nova/tasks/bootstrap.yml @@ -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" diff --git a/ansible/roles/nova/tasks/start.yml b/ansible/roles/nova/tasks/start.yml index 833e771abd..6070d32475 100644 --- a/ansible/roles/nova/tasks/start.yml +++ b/ansible/roles/nova/tasks/start.yml @@ -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 }}" diff --git a/ansible/roles/rabbitmq/tasks/bootstrap.yml b/ansible/roles/rabbitmq/tasks/bootstrap.yml index fffcbb94e8..6c0f86e46c 100644 --- a/ansible/roles/rabbitmq/tasks/bootstrap.yml +++ b/ansible/roles/rabbitmq/tasks/bootstrap.yml @@ -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" diff --git a/ansible/roles/rabbitmq/tasks/start.yml b/ansible/roles/rabbitmq/tasks/start.yml index 19295063ba..cdf7087943 100644 --- a/ansible/roles/rabbitmq/tasks/start.yml +++ b/ansible/roles/rabbitmq/tasks/start.yml @@ -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 }}" diff --git a/ansible/roles/swift/tasks/bootstrap.yml b/ansible/roles/swift/tasks/bootstrap.yml index 4d035fbb75..c132809fc9 100644 --- a/ansible/roles/swift/tasks/bootstrap.yml +++ b/ansible/roles/swift/tasks/bootstrap.yml @@ -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 }}" diff --git a/ansible/roles/swift/tasks/start.yml b/ansible/roles/swift/tasks/start.yml index ecd1da8c26..f20ee05359 100644 --- a/ansible/roles/swift/tasks/start.yml +++ b/ansible/roles/swift/tasks/start.yml @@ -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 }}" diff --git a/doc/ansible-deployment.rst b/doc/ansible-deployment.rst index 37a08a98a3..cad8681218 100644 --- a/doc/ansible-deployment.rst +++ b/doc/ansible-deployment.rst @@ -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.