From f01f4a845499b6c410c54f07053116bc0da34fa6 Mon Sep 17 00:00:00 2001 From: Andy McCrae Date: Thu, 15 Dec 2016 13:10:52 +0000 Subject: [PATCH] Remove Trusty final trusty bits from os_swift role Change-Id: I1d20338106f452a17d103231e9321cb3cc106087 Implements: blueprint trusty-removal --- bindep.txt | 2 +- tasks/swift_sync_post_install.yml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/bindep.txt b/bindep.txt index fe589259..ee6c1ca9 100644 --- a/bindep.txt +++ b/bindep.txt @@ -32,7 +32,7 @@ libselinux-python [platform:rpm] # For SSL SNI support python-pyasn1 [platform:dpkg] python-openssl [platform:dpkg] -python-ndg-httpsclient [platform:ubuntu !platform:ubuntu-trusty] +python-ndg-httpsclient [platform:ubuntu] python2-pyasn1 [platform:rpm] pyOpenSSL [platform:rpm] python-ndg_httpsclient [platform:rpm] diff --git a/tasks/swift_sync_post_install.yml b/tasks/swift_sync_post_install.yml index bd681b29..3a657a1d 100644 --- a/tasks/swift_sync_post_install.yml +++ b/tasks/swift_sync_post_install.yml @@ -17,7 +17,6 @@ service: name: "{{ item.value.program_name }}" state: "started" - pattern: "{{ item.value.program_name }}" with_dict: "{{ swift_services }}" when: - inventory_hostname in groups[item.value.group]