Remove Trusty support from plugins role

Change-Id: Ibab5aa0e202a427563e74a4356ba52bc70d7042c
Implements: blueprint trusty-removal
This commit is contained in:
Andy McCrae 2016-12-15 15:17:28 +00:00
parent 3d5f848a07
commit 1bc328cd01
3 changed files with 4 additions and 4 deletions

4
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.provider "virtualbox" do |v| config.vm.provider "virtualbox" do |v|
v.memory = 2048 v.memory = 2048
v.cpus = 2 v.cpus = 2
@ -10,4 +10,4 @@ Vagrant.configure(2) do |config|
apt-get update apt-get update
./run_tests.sh ./run_tests.sh
SHELL SHELL
end end

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
- rabbitmq - rabbitmq