Remove Trusty final trusty bits from os_swift role

Change-Id: I1d20338106f452a17d103231e9321cb3cc106087 Implements: blueprint trusty-removal
2016-12-15 13:10:52 +00:00 · 2016-12-15 13:10:52 +00:00 · f01f4a8454
parent 06471b9977
commit f01f4a8454
2 changed files with 1 additions and 2 deletions
--- 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]
--- 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]