diff --git a/Vagrantfile b/Vagrantfile index 44872e1e..40fe9135 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -1,5 +1,5 @@ Vagrant.configure(2) do |config| - config.vm.box = "ubuntu/trusty64" + config.vm.box = "ubuntu/xenial64" config.vm.provision "shell", inline: <<-SHELL sudo su - cd /vagrant diff --git a/bindep.txt b/bindep.txt index fe589259..ee6c1ca9 100644 --- a/bindep.txt +++ b/bindep.txt @@ -32,7 +32,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/handlers/main.yml b/handlers/main.yml index f05c2b02..3aa834d2 100644 --- a/handlers/main.yml +++ b/handlers/main.yml @@ -17,5 +17,4 @@ service: name: "sysstat" state: "restarted" - pattern: "sysstat" enabled: "yes" diff --git a/meta/main.yml b/meta/main.yml index f10ad7fe..d623daf3 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -22,7 +22,6 @@ galaxy_info: platforms: - name: Ubuntu versions: - - trusty - xenial categories: - cloud diff --git a/vars/ubuntu-14.04.yml b/vars/ubuntu-14.04.yml deleted file mode 100644 index 87ef9c36..00000000 --- a/vars/ubuntu-14.04.yml +++ /dev/null @@ -1,82 +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 - -## Defined required kernel -openstack_host_required_kernel: 3.13.0-34-generic -openstack_host_sysstat_file: /etc/default/systat -openstack_host_cron_template: sysstat.cron.debian.j2 -openstask_host_module_file: /etc/modules - -## Kernel modules loaded on hosts -openstack_host_kernel_modules: - - 8021q - # TODO (odyssey4me): revise the minimum kernel version once this kernel version is commonplace - # If we end up with more requirements like this, then we should change the approach. - - "{% if hostvars[inventory_hostname]['ansible_kernel'] | version_compare('3.18.0-0-generic', '>') %}br_netfilter{% endif %}" - - dm_multipath - - dm_snapshot - - ebtables - - ip6table_filter - - ip6_tables - - ip_tables - - ipt_MASQUERADE - - ipt_REJECT - - iptable_filter - - iptable_mangle - - iptable_nat - - ip_vs - - iscsi_tcp - - nbd - - nf_conntrack - - nf_conntrack_ipv4 - - nf_defrag_ipv4 - - nf_nat - - nf_nat_ipv4 - # TODO (odyssey4me): revise the minimum kernel version once this kernel version is commonplace - # If we end up with more requirements like this, then we should change the approach. - - "{% if hostvars[inventory_hostname]['ansible_kernel'] | version_compare('4.4.0-0-generic', '<') %}scsi_dh{% endif %}" - - vhost_net - - x_tables - -## Base packages -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-{{ ansible_kernel }} - - lvm2 - - python-software-properties - - python-dev - - rsync - - rsyslog - - sshpass - - sysstat - - time - - vlan - - wget