openstack/openstack-ansible-rabbitmq_server
Code Issues Proposed changes

Remove Trusty support for rabbitmq_server role

Browse Source 
Change-Id: I8fd756108188b887d343c67ad48c7aed1680c421
Implements: blueprint trusty-removal
This commit is contained in:
Andy McCrae
2016-12-15 15:22:20 +00:00
committed by Andy McCrae
parent 2ba0a74678
commit 2e82ac9652
3 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Vagrantfile vendored
View File

@@ -4,15 +4,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
@@ -21,4 +12,4 @@ Vagrant.configure(2) do |config|
./run_tests.sh ./run_tests.sh
SHELL SHELL
end end
end end

2
bindep.txt
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]

1
meta/main.yml
View File

@@ -22,7 +22,6 @@ galaxy_info:
platforms: platforms:
- name: Ubuntu - name: Ubuntu
versions: versions:
- trusty
- xenial - xenial
- name: EL - name: EL
versions: versions: