openstack
/
openstack-ansible-repo_build
Code Issues Proposed changes

Remove Trusty support from repo_build role 

Change-Id: I06991d14ff62deee08265cfaf4caac808051ea5f
Implements: blueprint trusty-removal
This commit is contained in:
Andy McCrae 2016-12-15 15:28:06 +00:00
parent da7b0e120e
commit 74b5246637
5 changed files with 3 additions and 198 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Vagrantfile vendored
View File

@ -3,7 +3,7 @@ Vagrant.configure(2) do |config|
v.memory = 2048 v.memory = 2048
v.cpus = 2 v.cpus = 2
end end
config.vm.box = "ubuntu/trusty64" config.vm.box = "ubuntu/xenial64"
config.vm.provision "shell", inline: <<-SHELL config.vm.provision "shell", inline: <<-SHELL
cd /vagrant cd /vagrant
./run_tests.sh ./run_tests.sh

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]

2
meta/main.yml
View File

@ -22,7 +22,7 @@ galaxy_info:
platforms: platforms:
- name: Ubuntu - name: Ubuntu
versions: versions:
- trusty - xenial
categories: categories:
- cloud - cloud
- python - python

150
tests/test-vars.yml
View File

@ -394,20 +394,6 @@ local_packages:
- mariadb-devel - mariadb-devel
- openssl-devel - openssl-devel
- python-devel - python-devel
ubuntu-14.04:
galera_client_distro_packages:
- build-essential
- libaio1
- libc6
- libdbd-mysql-perl
- libgcc1
- libgcrypt11
- libmariadbclient-dev
- libssl-dev
- libstdc++6
- mariadb-client
- mariadb-client-core-10.0
- python-dev
ubuntu-16.04: ubuntu-16.04:
galera_client_distro_packages: galera_client_distro_packages:
- build-essential - build-essential
@ -434,10 +420,6 @@ local_packages:
- rsync - rsync
- socat - socat
- which - which
ubuntu-14.04:
galera_server_percona_distro_packages:
- percona-xtrabackup
- qpress
ubuntu-16.04: ubuntu-16.04:
galera_server_percona_distro_packages: galera_server_percona_distro_packages:
- percona-xtrabackup - percona-xtrabackup
@ -450,11 +432,6 @@ local_packages:
haproxy_distro_packages: haproxy_distro_packages:
- haproxy - haproxy
- rsyslog - rsyslog
ubuntu-14.04:
haproxy_required_distro_packages:
- debconf-utils
- python-software-properties
- software-properties-common
ubuntu-16.04: ubuntu-16.04:
haproxy_required_distro_packages: haproxy_required_distro_packages:
- debconf-utils - debconf-utils
@ -484,25 +461,6 @@ local_packages:
- python34-libs - python34-libs
- redhat-lsb - redhat-lsb
- xz - xz
ubuntu-14.04:
lxc_hosts_distro_packages:
- apparmor
- apparmor-utils
- bridge-utils
- cgmanager
- cgroup-lite
- debootstrap
- dnsmasq
- git
- irqbalance
- language-pack-en
- liblxc1
- lxc
- lxc-dev
- lxc-templates
- pxz
- python-dev
- python3-lxc
ubuntu-16.04: ubuntu-16.04:
lxc_hosts_distro_packages: lxc_hosts_distro_packages:
- apparmor - apparmor
@ -559,33 +517,6 @@ local_packages:
- time - time
- vconfig - vconfig
- wget - wget
ubuntu-14.04:
openstack_host_distro_packages:
- apparmor-utils
- apt-transport-https
- bridge-utils
- build-essential
- cgroup-lite
- curl
- dmeventd
- dstat
- ebtables
- htop
- iptables
- irqbalance
- libkmod-dev
- libkmod2
- linux-image-extra-virtual
- lvm2
- python-dev
- python-software-properties
- rsync
- rsyslog
- sshpass
- sysstat
- time
- vlan
- wget
ubuntu-16.04: ubuntu-16.04:
openstack_host_distro_packages: openstack_host_distro_packages:
- apparmor-utils - apparmor-utils
@ -620,29 +551,17 @@ local_packages:
project_group: all project_group: all
os_ceilometer: os_ceilometer:
project_group: all project_group: all
ubuntu-14.04:
ceilometer_developer_mode_distro_packages:
- libvirt-dev
ubuntu-16.04: ubuntu-16.04:
ceilometer_developer_mode_distro_packages: ceilometer_developer_mode_distro_packages:
- libvirt-dev - libvirt-dev
- pkg-config - pkg-config
os_cinder: os_cinder:
project_group: all project_group: all
ubuntu-14.04:
cinder_volume_distro_packages:
- qemu-utils
ubuntu-16.04: ubuntu-16.04:
cinder_volume_distro_packages: cinder_volume_distro_packages:
- qemu-utils - qemu-utils
os_glance: os_glance:
project_group: all project_group: all
ubuntu-14.04:
glance_distro_packages:
- git
- nfs-common
- rpcbind
- rsync
ubuntu-16.04: ubuntu-16.04:
glance_distro_packages: glance_distro_packages:
- git - git
@ -651,15 +570,6 @@ local_packages:
- rsync - rsync
os_gnocchi: os_gnocchi:
project_group: all project_group: all
ubuntu-14.04:
gnocchi_distro_packages:
- apache2
- apache2-utils
- build-essential
- git
- libapache2-mod-wsgi
- libpq-dev
- python-dev
ubuntu-16.04: ubuntu-16.04:
gnocchi_distro_packages: gnocchi_distro_packages:
- apache2 - apache2
@ -671,10 +581,6 @@ local_packages:
- python-dev - python-dev
os_heat: os_heat:
project_group: all project_group: all
ubuntu-14.04:
heat_distro_packages:
- libxslt1.1
- rsync
ubuntu-16.04: ubuntu-16.04:
heat_distro_packages: heat_distro_packages:
- libxslt1.1 - libxslt1.1
@ -695,11 +601,6 @@ local_packages:
project_group: all project_group: all
os_ironic: os_ironic:
project_group: all project_group: all
ubuntu-14.04:
ironic_api_distro_packages:
- apache2
- apache2-utils
- libapache2-mod-wsgi
ubuntu-16.04: ubuntu-16.04:
ironic_api_distro_packages: ironic_api_distro_packages:
- apache2 - apache2
@ -710,10 +611,6 @@ local_packages:
redhat-7: redhat-7:
keystone_idp_distro_packages: keystone_idp_distro_packages:
- xmlsec1 - xmlsec1
ubuntu-14.04:
keystone_idp_distro_packages:
- ssl-cert
- xmlsec1
ubuntu-16.04: ubuntu-16.04:
keystone_idp_distro_packages: keystone_idp_distro_packages:
- ssl-cert - ssl-cert
@ -733,20 +630,11 @@ local_packages:
project_group: all project_group: all
os_neutron: os_neutron:
project_group: all project_group: all
ubuntu-14.04:
neutron_remove_distro_packages:
- conntrackd
ubuntu-16.04: ubuntu-16.04:
neutron_remove_distro_packages: neutron_remove_distro_packages:
- conntrackd - conntrackd
os_nova: os_nova:
project_group: all project_group: all
ubuntu-14.04:
nova_distro_packages:
- genisoimage
- git
- iptables
- libpq-dev
ubuntu-16.04: ubuntu-16.04:
nova_distro_packages: nova_distro_packages:
- genisoimage - genisoimage
@ -768,11 +656,6 @@ local_packages:
project_group: all project_group: all
os_sahara: os_sahara:
project_group: all project_group: all
ubuntu-14.04:
sahara_distro_packages:
- git
- rpcbind
- rsync
ubuntu-16.04: ubuntu-16.04:
sahara_distro_packages: sahara_distro_packages:
- git - git
@ -797,9 +680,6 @@ local_packages:
redhat-7: redhat-7:
tempest_distro_packages: tempest_distro_packages:
- git - git
ubuntu-14.04:
tempest_distro_packages:
- git-core
ubuntu-16.04: ubuntu-16.04:
tempest_distro_packages: tempest_distro_packages:
- git-core - git-core
@ -813,15 +693,6 @@ local_packages:
- pyopenssl - pyopenssl
- python-devel - python-devel
- python-pyasn1 - python-pyasn1
ubuntu-14.04:
pip_install_distro_packages:
- build-essential
- libffi-dev
- libssl-dev
- python-dev
- python-openssl
- python-pyasn1
- python-setuptools
ubuntu-16.04: ubuntu-16.04:
pip_install_distro_packages: pip_install_distro_packages:
- build-essential - build-essential
@ -854,27 +725,6 @@ local_packages:
- swig - swig
- tar - tar
- which - which
ubuntu-14.04:
repo_build_distro_packages:
- build-essential
- cmake
- git
- liberasurecode-dev
- libffi-dev
- libjpeg-dev
- libkrb5-dev
- libldap2-dev
- libmariadbclient-dev
- libpq-dev
- libsasl2-dev
- libsqlite3-dev
- libssl-dev
- libvirt-dev
- libxslt1-dev
- lxc-dev
- pkg-config
- python-dev
- swig
ubuntu-16.04: ubuntu-16.04:
repo_build_distro_packages: repo_build_distro_packages:
- build-essential - build-essential

45
vars/ubuntu-14.04.yml
View File

@ -1,45 +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.
## APT Cache options
cache_timeout: 600
# Ubuntu Cloud Archive variables
# There are no UCA packages for Trusty beyond Mitaka, so the selected
# release here has to remain at Mitaka.
uca_openstack_release: mitaka
uca_repo_dist: "{{ ansible_lsb.codename }}-updates/{{ uca_openstack_release }}"
uca_repo: "deb {{ uca_apt_repo_url }} {{ uca_repo_dist }} main"
repo_build_distro_packages:
- build-essential
- cmake
- git
- liberasurecode-dev # required to build pyeclib
- libffi-dev # required to build xattr
- libjpeg-dev # required to build pillow
- libkrb5-dev # required to build pykerberos
- libldap2-dev # required to build python-ldap
- libmariadbclient-dev # required to build MySQL-python
- libpq-dev # required to build psycopg2
- libsasl2-dev # required to build python-ldap
- libsqlite3-dev # required to build pysqlite
- libssl-dev # required to build cryptography
- libvirt-dev # required to build libvirt-python
- libxslt1-dev # required to build lxml
- lxc-dev # required to build lxc-python2
- pkg-config
- python-dev
- swig