Remove trusty from apt_package_pinning role

Reference to supported distros in meta/main.yml should change.

Change-Id: I66fa3c73e1112370f2c0d41173491f0f54aaf8e3
Implements: blueprint trusty-removal
This commit is contained in:
Andy McCrae 2016-12-15 10:37:14 +00:00
parent 645a103433
commit a8f04da96a
3 changed files with 3 additions and 3 deletions

2
Vagrantfile vendored
View File

@ -1,5 +1,5 @@
Vagrant.configure(2) do |config| Vagrant.configure(2) do |config|
config.vm.box = "ubuntu/trusty64" config.vm.box = "ubuntu/xenial64"
config.vm.provision "shell", inline: <<-SHELL config.vm.provision "shell", inline: <<-SHELL
sudo su - sudo su -
cd /vagrant cd /vagrant

View File

@ -32,7 +32,7 @@ libselinux-python [platform:rpm]
# For SSL SNI support # For SSL SNI support
python-pyasn1 [platform:dpkg] python-pyasn1 [platform:dpkg]
python-openssl [platform:dpkg] python-openssl [platform:dpkg]
python-ndg-httpsclient [platform:ubuntu !platform:ubuntu-trusty] python-ndg-httpsclient [platform:ubuntu]
python2-pyasn1 [platform:rpm] python2-pyasn1 [platform:rpm]
pyOpenSSL [platform:rpm] pyOpenSSL [platform:rpm]
python-ndg_httpsclient [platform:rpm] python-ndg_httpsclient [platform:rpm]

View File

@ -22,7 +22,7 @@ galaxy_info:
platforms: platforms:
- name: Ubuntu - name: Ubuntu
versions: versions:
- trusty - xenial
categories: categories:
- cloud - cloud
- apt - apt