Remove Trusty support from os_horizon role

Change-Id: I7d2e00871840b493bcd5d4edb131dd689ff01efc Implements: blueprint trusty-removal
openstack · Dec 15, 2016 · 8db4cd3 · 8db4cd3
1 parent fe519cb
commit 8db4cd3
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 11 deletions.
diff --git a/Vagrantfile b/Vagrantfile
@@ -5,15 +5,6 @@ Vagrant.configure(2) do |config|
     v.cpus = 2
   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|
     xenial.vm.box = "ubuntu/xenial64"
     xenial.vm.provision "shell", inline: <<-SHELL

diff --git a/bindep.txt b/bindep.txt
@@ -34,7 +34,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
@@ -22,7 +22,6 @@ galaxy_info:
   platforms:
     - name: Ubuntu
       versions:
-        - trusty
         - xenial
   categories:
     - cloud