From a8f04da96a7b6421c94c5279d40a8c8a25a42980 Mon Sep 17 00:00:00 2001 From: Andy McCrae Date: Thu, 15 Dec 2016 10:37:14 +0000 Subject: [PATCH] Remove trusty from apt_package_pinning role Reference to supported distros in meta/main.yml should change. Change-Id: I66fa3c73e1112370f2c0d41173491f0f54aaf8e3 Implements: blueprint trusty-removal --- Vagrantfile | 2 +- bindep.txt | 2 +- meta/main.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index 44872e1..40fe913 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -1,5 +1,5 @@ Vagrant.configure(2) do |config| - config.vm.box = "ubuntu/trusty64" + config.vm.box = "ubuntu/xenial64" config.vm.provision "shell", inline: <<-SHELL sudo su - cd /vagrant diff --git a/bindep.txt b/bindep.txt index fe58925..ee6c1ca 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/meta/main.yml b/meta/main.yml index 6ee7366..26bfe77 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -22,7 +22,7 @@ galaxy_info: platforms: - name: Ubuntu versions: - - trusty + - xenial categories: - cloud - apt