Tidy docs on config options, drop surplus test files

This commit is contained in:
James Page 2015-12-14 17:14:43 +00:00
parent c2cee68744
commit 1a43d4cdd4
3 changed files with 15 additions and 34 deletions

View File

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

View File

@ -1,3 +0,0 @@
flake8>=2.2.4,<=2.4.1
os-testr>=0.4.1
charm-tools

25
tox.ini
View File

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