From 1218bcb3bf499d0ce584018f046d1e8821a7c19d Mon Sep 17 00:00:00 2001
From: Jonathan Rosser <jonathan.rosser@rd.bbc.co.uk>
Date: Thu, 27 Feb 2020 14:38:23 +0000
Subject: [PATCH] Add vars for debian buster

including I3eb65347b4988d376e02d7f4ff111b88b5043fb5
and I79d673e5b1fe9b9b1999a558b323821ddee970a9 as these
changes depend on each other.

Change-Id: I0121507e2f3ba63ec4b54283b588579f80f38965
---
 bindep.txt         |  1 +
 tox.ini            |  9 +------
 vars/debian-10.yml | 66 ++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 68 insertions(+), 8 deletions(-)
 create mode 100644 vars/debian-10.yml

diff --git a/bindep.txt b/bindep.txt
index ef56cb6..acfd18e 100644
--- a/bindep.txt
+++ b/bindep.txt
@@ -43,6 +43,7 @@ libffi-devel      [platform:rpm]
 openssl-devel     [platform:rpm]
 python-devel      [platform:rpm]
 python2-dnf       [platform:fedora]
+python3-devel     [platform:rpm]
 
 # Base requirements for Gentoo
 git               [platform:gentoo]
diff --git a/tox.ini b/tox.ini
index 26acb8a..f889443 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,6 +4,7 @@ skipsdist = True
 envlist = docs,linters,functional
 
 [testenv]
+basepython = python3
 usedevelop = True
 install_command =
     pip install -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} {opts} {packages}
@@ -33,7 +34,6 @@ setenv =
     PYTHONPATH={envsitepackagesdir}
 
 [testenv:docs]
-basepython = python3
 deps = -r{toxinidir}/doc/requirements.txt
 commands=
     bash -c "rm -rf doc/build"
@@ -45,19 +45,16 @@ commands=
 extensions = .rst
 
 [testenv:releasenotes]
-basepython = python3
 deps = -r{toxinidir}/doc/requirements.txt
 commands =
     sphinx-build -a -E -W -d releasenotes/build/doctrees --keep-going -b html releasenotes/source releasenotes/build/html
 
 # environment used by the -infra templated docs job
 [testenv:venv]
-basepython = python3
 commands =
     {posargs}
 
 [testenv:pep8]
-basepython = python3
 commands =
     bash -c "{toxinidir}/tests/common/test-pep8.sh"
 
@@ -68,17 +65,14 @@ commands =
 ignore=F403
 
 [testenv:bashate]
-basepython = python3
 commands =
     bash -c "{toxinidir}/tests/common/test-bashate.sh"
 
 [testenv:ansible-syntax]
-basepython = python3
 commands =
     bash -c "{toxinidir}/tests/common/test-ansible-syntax.sh"
 
 [testenv:ansible-lint]
-basepython = python3
 commands =
     bash -c "{toxinidir}/tests/common/test-ansible-lint.sh"
 
@@ -87,7 +81,6 @@ commands =
     bash -c "{toxinidir}/tests/common/test-ansible-functional.sh"
 
 [testenv:linters]
-basepython = python3
 commands =
     bash -c "{toxinidir}/tests/common/test-ansible-env-prep.sh"
     {[testenv:pep8]commands}
diff --git a/vars/debian-10.yml b/vars/debian-10.yml
new file mode 100644
index 0000000..1815612
--- /dev/null
+++ b/vars/debian-10.yml
@@ -0,0 +1,66 @@
+---
+# 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.
+
+_nspawn_hosts_container_image_url: "https://nspawn.org/storage/debian/buster/tar/image.tar.xz"
+
+_nspawn_hosts_distro_packages:
+  - bridge-utils
+  - btrfs-tools
+  - dbus
+  - dnsmasq
+  - git
+  - iptables
+  - irqbalance
+  - psmisc
+  - systemd-container
+
+_nspawn_container_distro_required_packages:
+  - gnupg
+
+_nspawn_container_distro_packages:
+  - apt-transport-https
+  - ca-certificates
+  - cron
+  - dbus
+  - debianutils
+  - gcc
+  - iproute2
+  - iputils-ping
+  - libnss-resolve
+  - libpython2.7
+  - locales
+  - netbase
+  - openssh-server
+  - openssl
+  - python2.7
+  - python-apt
+  - python-dev
+  - rsync
+  - sudo
+  - systemd
+  - tar
+  - tzdata
+  - wget
+
+_nspawn_cache_map:
+  distro: ubuntu
+  arch: "{{ nspawn_architecture_mapping.get(ansible_architecture) }}"
+  release: bionic
+
+_nspawn_copy_from_host:
+  - /etc/apt/sources.list
+  - /etc/apt/apt.conf.d/
+  - /etc/apt/preferences.d/
+  - /etc/apt/trusted.gpg.d