From 32ca60647926f6bccf8816cb6ce5edb9ed6476f2 Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Wed, 1 Aug 2018 11:39:20 +0100 Subject: [PATCH] Use generic vars file for ubuntu These vars work for both Xenial and Bionic Change-Id: I62b6cfefea64880f4c8bbd86f4667c73d3e93f52 --- 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 3ff35a5..0000000 --- a/vars/ubuntu-18.04.yml +++ /dev/null @@ -1,33 +0,0 @@ ---- -# Copyright 2018, 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. - -zun_docker_repo: - - name: "docker-ce" - uri: "https://download.docker.com/linux/ubuntu" - gpg_uri: "https://download.docker.com/linux/{{ ansible_distribution | lower }}/gpg" - -# Common apt packages -zun_distro_packages: - - ca-certificates - - curl - - git - - software-properties-common - -zun_distro_compute_packages: - - docker-ce - - pciutils - -## APT Cache options -cache_timeout: 600 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