From 7eca83de1f34021a532c9a92e3392dad159b6f29 Mon Sep 17 00:00:00 2001 From: Logan V Date: Sat, 21 Jul 2018 17:52:03 -0500 Subject: [PATCH] Remove bionic workaround There is no need to use the artful release since bionic packages are present in the repo now. Change-Id: Ib1d78b5f2a22c52d4ab6612b1214ecbfe1428bc4 --- vars/ubuntu-18.04.yml | 33 --------------------------- vars/{ubuntu-16.04.yml => ubuntu.yml} | 0 2 files changed, 33 deletions(-) delete mode 100644 vars/ubuntu-18.04.yml rename vars/{ubuntu-16.04.yml => ubuntu.yml} (100%) diff --git a/vars/ubuntu-18.04.yml b/vars/ubuntu-18.04.yml deleted file mode 100644 index 57ba001..0000000 --- a/vars/ubuntu-18.04.yml +++ /dev/null @@ -1,33 +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_repo_url: "http://{{ galera_repo_host }}/MariaDB/mariadb-{{ galera_client_major_version }}.{{ galera_client_minor_version }}/repo/ubuntu" -# Temporarily replace {{ ansible_distribution_release }} with artful, as bionic -# support is not provided yet -#_galera_client_repo: "deb {{ galera_client_repo_url }} {{ ansible_distribution_release }} main" -_galera_client_repo: "deb {{ galera_client_repo_url }} artful main" - -# libmariadbclient-dev is required for mysql_config, which is subsequently required for pip install of MySQL-python -galera_client_distro_packages: - - "mariadb-client-core-{{ galera_client_major_version }}" - - libmariadbclient-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: '0xF1656F24C74CD1D8' diff --git a/vars/ubuntu-16.04.yml b/vars/ubuntu.yml similarity index 100% rename from vars/ubuntu-16.04.yml rename to vars/ubuntu.yml