Remove Trusty support from os_horizon role

Change-Id: I7d2e00871840b493bcd5d4edb131dd689ff01efc
Implements: blueprint trusty-removal
This commit is contained in:
Andy McCrae 2016-12-15 12:04:18 +00:00
parent fe519cb41d
commit 8db4cd3e4b
3 changed files with 1 additions and 11 deletions

9
Vagrantfile vendored
View File

@ -5,15 +5,6 @@ Vagrant.configure(2) do |config|
v.cpus = 2 v.cpus = 2
end end
config.vm.define "ubuntu1404" do |trusty|
trusty.vm.box = "ubuntu/trusty64"
trusty.vm.provision "shell", inline: <<-SHELL
sudo su -
cd /vagrant
./run_tests.sh
SHELL
end
config.vm.define "ubuntu1604" do |xenial| config.vm.define "ubuntu1604" do |xenial|
xenial.vm.box = "ubuntu/xenial64" xenial.vm.box = "ubuntu/xenial64"
xenial.vm.provision "shell", inline: <<-SHELL xenial.vm.provision "shell", inline: <<-SHELL

View File

@ -34,7 +34,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,6 @@ galaxy_info:
platforms: platforms:
- name: Ubuntu - name: Ubuntu
versions: versions:
- trusty
- xenial - xenial
categories: categories:
- cloud - cloud