From 20b7b3cff53b78e0f0dbc6a26efcc9a6c3063e89 Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Wed, 1 Aug 2018 11:38:59 +0100 Subject: [PATCH] Use generic vars file for ubuntu These vars work for both Xenial and Bionic Change-Id: I387f212e785435fa59130c9689dd1a398cbd0da2 --- vars/ubuntu-18.04.yml | 52 --------------------------- vars/{ubuntu-16.04.yml => ubuntu.yml} | 0 2 files changed, 52 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 d236845..0000000 --- a/vars/ubuntu-18.04.yml +++ /dev/null @@ -1,52 +0,0 @@ ---- -# Copyright 2016 IBM Corp -# Copyright 2015, Serge van Ginderachter -# -# 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 - -# Ceph GPG Keys -ceph_gpg_keys: - - key_name: 'ceph' - keyserver: 'hkp://keyserver.ubuntu.com:80' - fallback_keyserver: 'hkp://p80.pool.sks-keyservers.net:80' - hash_id: '0xe84ac2c0460f3994' - -# The apt-key command won't del a key when you give it the hash_id, so we have -# to use the short key ID here instead. -ceph_revoked_gpg_keys: - - '17ED316D' - -# Ceph.com repository variables -ceph_apt_repo_url_region: "download" # or "eu" for Netherlands based mirror -ceph_apt_repo_url: "http://{{ ceph_apt_repo_url_region }}.ceph.com/debian-{{ ceph_stable_release }}/" - -# Ubuntu Cloud Archive variables -uca_openstack_release: queens -uca_repo_dist: "{{ ansible_lsb.codename }}-updates/{{ uca_openstack_release }}" -libvirt_package: libvirt-bin -libvirt_service_name: libvirt-bin - -python_ceph_packages: - - python-ceph - -# Apt repositories -ceph_apt_repos: - ceph: - repo: "deb {{ ceph_apt_repo_url }} {{ ansible_lsb.codename }} main" - state: "present" - uca: - repo: "deb {{ uca_apt_repo_url }} {{ uca_repo_dist }} main" - state: "present" 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