Add SSL cert/key config options

Add config options for charm users to be able to set SSL key, ca and
cert

Add dummy tox target to placate CI

Change-Id: If7e39e3cf73a2341539443fed228cac0cdf49b9f
This commit is contained in:
Liam Young 2016-07-08 14:03:40 +00:00
parent 529fadb27b
commit 4d51706679
3 changed files with 42 additions and 2 deletions

View File

@ -83,3 +83,22 @@ options:
description: |
Default CIDR netmask to use for HA vip when it cannot be automatically
determined.
ssl_cert:
type: string
default:
description: |
SSL certificate to install and use for API ports. Setting this value
and ssl_key will enable reverse proxying, point Glance's entry in the
Keystone catalog to use https, and override any certficiate and key
issued by Keystone (if it is configured to do so).
ssl_key:
type: string
default:
description: |
SSL key to use with certificate specified as ssl_cert.
ssl_ca:
type: string
default:
description: |
SSL CA to use with the certificate and key provided - this is only
required if you are providing a privately signed ssl_cert and ssl_key.

2
test-requirements.txt Normal file
View File

@ -0,0 +1,2 @@
flake8>=2.2.4,<=2.4.1
os-testr>=0.4.1

23
tox.ini
View File

@ -1,6 +1,6 @@
[tox]
skipsdist = True
envlist = pep8,build
envlist = pep8
[testenv]
basepython = python2.7
@ -13,14 +13,33 @@ install_command =
pip install {opts} {packages}
deps =
-r{toxinidir}/requirements.txt
whitelist_externals = /bin/true
whitelist_externals = /bin/true /bin/echo
[testenv:build]
commands =
/bin/echo 'WARNING: *build* target is for testing only.'
charm-build --log-level DEBUG -o {toxinidir}/build .
[testenv:venv]
commands = {posargs}
[testenv:py27]
basepython = python2.7
deps = -r{toxinidir}/test-requirements.txt
# TODO: Need to write unit tests then remove the following command.
commands = /bin/true
[testenv:py34]
basepython = python3.4
deps = -r{toxinidir}/test-requirements.txt
# TODO: Need to write unit tests then remove the following command.
commands = /bin/true
[testenv:py35]
basepython = python3.5
deps = -r{toxinidir}/test-requirements.txt
# TODO: Need to write unit tests then remove the following command.
commands = /bin/true
[testenv:pep8]
commands = /bin/true