Remove Trusty support from lxc_container_create role
Change-Id: Ib1c83be6ed07c3c804704c2419e32c4d50fce04e Implements: blueprint trusty-removal
This commit is contained in:
parent
b37b1e8fde
commit
ae22ddc970
15
Vagrantfile
vendored
15
Vagrantfile
vendored
@ -1,20 +1,5 @@
|
|||||||
Vagrant.configure(2) do |config|
|
Vagrant.configure(2) do |config|
|
||||||
|
|
||||||
config.vm.define "ubuntu1404" do |trusty|
|
|
||||||
trusty.vm.box = "ubuntu/trusty64"
|
|
||||||
|
|
||||||
trusty.vm.provider "virtualbox" do |v|
|
|
||||||
v.memory = 2048
|
|
||||||
v.cpus = 2
|
|
||||||
end
|
|
||||||
|
|
||||||
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.provider "virtualbox" do |v|
|
xenial.vm.provider "virtualbox" do |v|
|
||||||
|
@ -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]
|
||||||
|
@ -22,7 +22,6 @@ galaxy_info:
|
|||||||
platforms:
|
platforms:
|
||||||
- name: Ubuntu
|
- name: Ubuntu
|
||||||
versions:
|
versions:
|
||||||
- trusty
|
|
||||||
- xenial
|
- xenial
|
||||||
- name: EL
|
- name: EL
|
||||||
versions:
|
versions:
|
||||||
|
@ -1,31 +0,0 @@
|
|||||||
---
|
|
||||||
# Copyright 2016, Rackspace US, Inc.
|
|
||||||
#
|
|
||||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
# you may not use this file except in compliance with the License.
|
|
||||||
# You may obtain a copy of the License at
|
|
||||||
#
|
|
||||||
# http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
#
|
|
||||||
# Unless required by applicable law or agreed to in writing, software
|
|
||||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
# See the License for the specific language governing permissions and
|
|
||||||
# limitations under the License.
|
|
||||||
|
|
||||||
# Note this is a used in an iterable and requires the <item.value.interface> variable
|
|
||||||
# The container interface variable is a a default object that assume the
|
|
||||||
# Ansible iterator type is `with_dict`.
|
|
||||||
lxc_container_interface: debian-interface.cfg.j2
|
|
||||||
|
|
||||||
# Notice this is already resolved in the debian interface file
|
|
||||||
lxc_container_route_interface: false
|
|
||||||
lxc_container_default_route_interfaces: false
|
|
||||||
|
|
||||||
# Note this is a used in an iterable and requires the <item.value.interface> variable
|
|
||||||
lxc_container_interface_target: "/etc/network/interfaces.d/{{ item.value.interface }}.cfg"
|
|
||||||
|
|
||||||
lxc_container_map:
|
|
||||||
distro: ubuntu
|
|
||||||
arch: "{{ lxc_architecture_mapping.get( hostvars[physical_host]['ansible_architecture'] | lower ) }}"
|
|
||||||
release: trusty
|
|
Loading…
Reference in New Issue
Block a user