Use generic vars file for ubuntu

These vars work for both Xenial and Bionic

Change-Id: I62b6cfefea64880f4c8bbd86f4667c73d3e93f52

vars/ubuntu-18.04.yml

@@ -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