From 99f1f7d59fc09278d5b818a4c709e87a83f7dbca Mon Sep 17 00:00:00 2001 From: Andy McCrae Date: Thu, 15 Dec 2016 10:42:55 +0000 Subject: [PATCH] Remove Trusty support from galera_client role Change-Id: I739651ff2c36fbe487abb3ad7f56038c0a12e748 Implements: blueprint trusty-removal --- Vagrantfile | 2 +- bindep.txt | 2 +- meta/main.yml | 1 - vars/ubuntu-14.04.yml | 41 ----------------------------------------- 4 files changed, 2 insertions(+), 44 deletions(-) delete mode 100644 vars/ubuntu-14.04.yml diff --git a/Vagrantfile b/Vagrantfile index 44872e1..40fe913 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 02d792c..080da07 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/meta/main.yml b/meta/main.yml index 6e02ec3..cfab0c9 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -22,7 +22,6 @@ galaxy_info: platforms: - name: Ubuntu versions: - - trusty - xenial - name: EL versions: diff --git a/vars/ubuntu-14.04.yml b/vars/ubuntu-14.04.yml deleted file mode 100644 index afccb68..0000000 --- a/vars/ubuntu-14.04.yml +++ /dev/null @@ -1,41 +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. - -# Repositories -galera_client_apt_repo_url: "http://mirror.rackspace.com/mariadb/repo/10.1/ubuntu" -galera_client_repo: "deb {{ galera_client_apt_repo_url }} {{ ansible_distribution_release }} main" - -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.1 - - python-dev - -# Galera GPG Keys -galera_client_gpg_keys: - - key_name: 'mariadb' - keyserver: 'hkp://keyserver.ubuntu.com:80' - fallback_keyserver: 'hkp://p80.pool.sks-keyservers.net:80' - hash_id: '0xcbcb082a1bb943db' - -galera_client_package_pins: [{ package: "*", release: MariaDB, priority: "1001" }]