From 1a43d4cdd409b94b519dd4a9f7a74a4fd73e8037 Mon Sep 17 00:00:00 2001
From: James Page <james.page@ubuntu.com>
Date: Mon, 14 Dec 2015 17:14:43 +0000
Subject: [PATCH] Tidy docs on config options, drop surplus test files

---
 config.yaml           | 21 +++++++++++++++------
 test-requirements.txt |  3 ---
 tox.ini               | 25 -------------------------
 3 files changed, 15 insertions(+), 34 deletions(-)
 delete mode 100644 test-requirements.txt
 delete mode 100644 tox.ini

diff --git a/config.yaml b/config.yaml
index cf6a965..1222bc4 100644
--- a/config.yaml
+++ b/config.yaml
@@ -3,13 +3,22 @@ options:
     default: distro
     type: string
     description: |
-      Repository from which to install.  May be one of the following:
-      distro (default), ppa:somecustom/ppa, a deb url sources entry,
-      or a supported Cloud Archive release pocket.
+      Repository from which to install OpenStack.
 
-      Supported Cloud Archive sources include: cloud:precise-folsom,
-      cloud:precise-folsom/updates, cloud:precise-folsom/staging,
-      cloud:precise-folsom/proposed.
+      May be one of the following:
+
+        distro (default)
+        ppa:somecustom/ppa (PPA name must include OpenStack Release)
+        deb url sources entry|key id
+        or a supported Ubuntu Cloud Archive pocket.
+
+      Supported Ubuntu Cloud Archive pockets include:
+
+        cloud:trusty-liberty
+        cloud:trusty-juno
+        cloud:trusty-kilo
+        cloud:trusty-liberty
+        cloud:trusty-mitaka
 
       Note that updating this setting to a source that is known to
       provide a later version of OpenStack will trigger a software
diff --git a/test-requirements.txt b/test-requirements.txt
deleted file mode 100644
index 10dbed3..0000000
--- a/test-requirements.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-flake8>=2.2.4,<=2.4.1
-os-testr>=0.4.1
-charm-tools
diff --git a/tox.ini b/tox.ini
deleted file mode 100644
index 99c57e5..0000000
--- a/tox.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-[tox]
-envlist = lint,py27
-skipsdist = True
-
-[testenv]
-setenv = VIRTUAL_ENV={envdir}
-         PYTHONHASHSEED=0
-install_command =
-  pip install --allow-unverified python-apt {opts} {packages}
-commands = ostestr {posargs}
-
-[testenv:py27]
-basepython = python2.7
-deps = -r{toxinidir}/test-requirements.txt
-
-[testenv:lint]
-basepython = python2.7
-deps = -r{toxinidir}/test-requirements.txt
-commands = flake8 {posargs} lib
-
-[testenv:venv]
-commands = {posargs}
-
-[flake8]
-ignore = E402,E226