Update tests, tox, series and readme for 18.11 release
Change-Id: I5012167e6f69e57812f1d60b50318d2dbe72e17a
This commit is contained in:
parent
42ddeca26f
commit
36189ac193
|
@ -11,15 +11,18 @@ description: |
|
||||||
addition to its "native" API (the OpenStack API), it also supports the Amazon
|
addition to its "native" API (the OpenStack API), it also supports the Amazon
|
||||||
EC2 API.
|
EC2 API.
|
||||||
.
|
.
|
||||||
This charm provides the cloud controller service for OpenStack Nova cell
|
This charm provides the cloud controller service for the OpenStack Nova cell
|
||||||
and includes nova-conductor service.
|
and includes the nova-conductor service.
|
||||||
|
.
|
||||||
|
OpenStack Rocky or later is required for the Nova cells feature.
|
||||||
|
.
|
||||||
|
See usage guidance as published in the charm deployment guide:
|
||||||
|
* https://docs.openstack.org/project-deploy-guide/charm-deployment-guide/latest/app-nova-cells.html
|
||||||
tags:
|
tags:
|
||||||
- openstack
|
- openstack
|
||||||
series:
|
series:
|
||||||
- xenial
|
|
||||||
- bionic
|
- bionic
|
||||||
- artful
|
# - cosmic # Pending LP https://bugs.launchpad.net/bugs/1804063
|
||||||
- trusty
|
|
||||||
extra-bindings:
|
extra-bindings:
|
||||||
public:
|
public:
|
||||||
admin:
|
admin:
|
||||||
|
|
|
@ -0,0 +1,138 @@
|
||||||
|
series: cosmic
|
||||||
|
relations:
|
||||||
|
- - nova-cloud-controller:nova-cell-api
|
||||||
|
- nova-cell-controller-cell2:nova-cell-compute
|
||||||
|
- - nova-cloud-controller:shared-db-cell
|
||||||
|
- mysql-cell2:shared-db
|
||||||
|
- - nova-cloud-controller:amqp-cell
|
||||||
|
- rabbitmq-server-nova-cell2:amqp
|
||||||
|
- - nova-compute-cell2:amqp
|
||||||
|
- rabbitmq-server-nova-cell2:amqp
|
||||||
|
- - neutron-gateway:amqp
|
||||||
|
- rabbitmq-server-neutron:amqp
|
||||||
|
- - neutron-gateway:amqp-nova
|
||||||
|
- rabbitmq-server-nova:amqp
|
||||||
|
- - keystone:shared-db
|
||||||
|
- mysql:shared-db
|
||||||
|
- - nova-cloud-controller:identity-service
|
||||||
|
- keystone:identity-service
|
||||||
|
- - glance:identity-service
|
||||||
|
- keystone:identity-service
|
||||||
|
- - neutron-api:identity-service
|
||||||
|
- keystone:identity-service
|
||||||
|
- - neutron-openvswitch:neutron-plugin-api
|
||||||
|
- neutron-api:neutron-plugin-api
|
||||||
|
- - neutron-api:shared-db
|
||||||
|
- mysql:shared-db
|
||||||
|
- - neutron-api:amqp
|
||||||
|
- rabbitmq-server-neutron:amqp
|
||||||
|
- - neutron-gateway:neutron-plugin-api
|
||||||
|
- neutron-api:neutron-plugin-api
|
||||||
|
- - glance:shared-db
|
||||||
|
- mysql:shared-db
|
||||||
|
- - glance:amqp
|
||||||
|
- rabbitmq-server-neutron:amqp
|
||||||
|
- - nova-cloud-controller:image-service
|
||||||
|
- glance:image-service
|
||||||
|
- - nova-compute-cell2:image-service
|
||||||
|
- glance:image-service
|
||||||
|
- - nova-cell-controller-cell2:cloud-compute
|
||||||
|
- nova-compute-cell2:cloud-compute
|
||||||
|
- - nova-cloud-controller:amqp
|
||||||
|
- rabbitmq-server-nova:amqp
|
||||||
|
- - nova-cell-controller-cell2:amqp
|
||||||
|
- rabbitmq-server-nova-cell2:amqp
|
||||||
|
- - nova-cloud-controller:quantum-network-service
|
||||||
|
- neutron-gateway:quantum-network-service
|
||||||
|
- - nova-compute-cell2:neutron-plugin
|
||||||
|
- neutron-openvswitch:neutron-plugin
|
||||||
|
- - neutron-openvswitch:amqp
|
||||||
|
- rabbitmq-server-neutron:amqp
|
||||||
|
- - nova-cloud-controller:shared-db
|
||||||
|
- mysql:shared-db
|
||||||
|
- - nova-cell-controller-cell2:shared-db
|
||||||
|
- mysql-cell2:shared-db
|
||||||
|
- - nova-cloud-controller:neutron-api
|
||||||
|
- neutron-api:neutron-api
|
||||||
|
- - nova-compute-cell2:cloud-credentials
|
||||||
|
- keystone:identity-credentials
|
||||||
|
- - ntp:juju-info
|
||||||
|
- nova-compute-cell2:juju-info
|
||||||
|
- - ntp:juju-info
|
||||||
|
- neutron-gateway:juju-info
|
||||||
|
applications:
|
||||||
|
glance:
|
||||||
|
charm: cs:~openstack-charmers-next/glance
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
worker-multiplier: 0.25
|
||||||
|
keystone:
|
||||||
|
charm: cs:~openstack-charmers-next/keystone
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
admin-password: openstack
|
||||||
|
worker-multiplier: 0.25
|
||||||
|
mysql:
|
||||||
|
charm: cs:~openstack-charmers-next/percona-cluster
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
innodb-buffer-pool-size: 256M
|
||||||
|
max-connections: 1000
|
||||||
|
mysql-cell2:
|
||||||
|
charm: cs:~openstack-charmers-next/percona-cluster
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
innodb-buffer-pool-size: 256M
|
||||||
|
max-connections: 1000
|
||||||
|
neutron-api:
|
||||||
|
charm: cs:~openstack-charmers-next/neutron-api
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
flat-network-providers: physnet1
|
||||||
|
neutron-security-groups: true
|
||||||
|
worker-multiplier: 0.25
|
||||||
|
neutron-gateway:
|
||||||
|
charm: cs:~openstack-charmers-next/neutron-gateway
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
bridge-mappings: physnet1:br-ex
|
||||||
|
worker-multiplier: 0.25
|
||||||
|
neutron-openvswitch:
|
||||||
|
charm: cs:~openstack-charmers-next/neutron-openvswitch
|
||||||
|
num_units: 0
|
||||||
|
nova-cloud-controller:
|
||||||
|
charm: cs:~openstack-charmers-next/nova-cloud-controller
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
network-manager: Neutron
|
||||||
|
worker-multiplier: 0.25
|
||||||
|
debug: true
|
||||||
|
nova-cell-controller-cell2:
|
||||||
|
charm: nova-cell-controller
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
worker-multiplier: 0.25
|
||||||
|
debug: true
|
||||||
|
cell-name: "cell2"
|
||||||
|
nova-compute-cell2:
|
||||||
|
charm: cs:~openstack-charmers-next/nova-compute
|
||||||
|
num_units: 1
|
||||||
|
constraints: mem=4G
|
||||||
|
options:
|
||||||
|
config-flags: default_ephemeral_format=ext4
|
||||||
|
enable-live-migration: true
|
||||||
|
enable-resize: true
|
||||||
|
migration-auth-type: ssh
|
||||||
|
debug: true
|
||||||
|
ntp:
|
||||||
|
charm: cs:ntp-24
|
||||||
|
num_units: 0
|
||||||
|
rabbitmq-server-nova:
|
||||||
|
charm: cs:~openstack-charmers-next/rabbitmq-server
|
||||||
|
num_units: 1
|
||||||
|
rabbitmq-server-nova-cell2:
|
||||||
|
charm: cs:~openstack-charmers-next/rabbitmq-server
|
||||||
|
num_units: 1
|
||||||
|
rabbitmq-server-neutron:
|
||||||
|
charm: cs:~openstack-charmers-next/rabbitmq-server
|
||||||
|
num_units: 1
|
|
@ -9,5 +9,6 @@ configure:
|
||||||
- zaza.charm_tests.nova.setup.manage_ssh_key
|
- zaza.charm_tests.nova.setup.manage_ssh_key
|
||||||
gate_bundles:
|
gate_bundles:
|
||||||
- bionic-rocky
|
- bionic-rocky
|
||||||
|
# - cosmic-rocky # Pending LP https://bugs.launchpad.net/bugs/1804063
|
||||||
smoke_bundles:
|
smoke_bundles:
|
||||||
- bionic-rocky
|
- bionic-rocky
|
||||||
|
|
|
@ -12,7 +12,7 @@ install_command =
|
||||||
pip install {opts} {packages}
|
pip install {opts} {packages}
|
||||||
|
|
||||||
[testenv:pep8]
|
[testenv:pep8]
|
||||||
basepython = python2.7
|
basepython = python3
|
||||||
deps=charm-tools
|
deps=charm-tools
|
||||||
commands = charm-proof
|
commands = charm-proof
|
||||||
|
|
||||||
|
|
20
tox.ini
20
tox.ini
|
@ -3,8 +3,7 @@
|
||||||
# within individual charm repos.
|
# within individual charm repos.
|
||||||
[tox]
|
[tox]
|
||||||
skipsdist = True
|
skipsdist = True
|
||||||
envlist = pep8,py34,py35
|
envlist = pep8,py3
|
||||||
skip_missing_interpreters = True
|
|
||||||
|
|
||||||
[testenv]
|
[testenv]
|
||||||
setenv = VIRTUAL_ENV={envdir}
|
setenv = VIRTUAL_ENV={envdir}
|
||||||
|
@ -19,20 +18,12 @@ deps =
|
||||||
-r{toxinidir}/requirements.txt
|
-r{toxinidir}/requirements.txt
|
||||||
|
|
||||||
[testenv:build]
|
[testenv:build]
|
||||||
basepython = python2.7
|
basepython = python3
|
||||||
commands =
|
commands =
|
||||||
charm-build --log-level DEBUG -o {toxinidir}/build src {posargs}
|
charm-build --log-level DEBUG -o {toxinidir}/build src {posargs}
|
||||||
|
|
||||||
[testenv:py27]
|
[testenv:py3]
|
||||||
basepython = python2.7
|
basepython = python3
|
||||||
# Reactive source charms are Python3-only, but a py27 unit test target
|
|
||||||
# is required by OpenStack Governance. Remove this shim as soon as
|
|
||||||
# permitted. https://governance.openstack.org/tc/reference/cti/python_cti.html
|
|
||||||
whitelist_externals = true
|
|
||||||
commands = true
|
|
||||||
|
|
||||||
[testenv:py34]
|
|
||||||
basepython = python3.4
|
|
||||||
deps = -r{toxinidir}/test-requirements.txt
|
deps = -r{toxinidir}/test-requirements.txt
|
||||||
commands = ostestr {posargs}
|
commands = ostestr {posargs}
|
||||||
|
|
||||||
|
@ -47,11 +38,12 @@ deps = -r{toxinidir}/test-requirements.txt
|
||||||
commands = ostestr {posargs}
|
commands = ostestr {posargs}
|
||||||
|
|
||||||
[testenv:pep8]
|
[testenv:pep8]
|
||||||
basepython = python3.5
|
basepython = python3
|
||||||
deps = -r{toxinidir}/test-requirements.txt
|
deps = -r{toxinidir}/test-requirements.txt
|
||||||
commands = flake8 {posargs} src unit_tests
|
commands = flake8 {posargs} src unit_tests
|
||||||
|
|
||||||
[testenv:venv]
|
[testenv:venv]
|
||||||
|
basepython = python3
|
||||||
commands = {posargs}
|
commands = {posargs}
|
||||||
|
|
||||||
[flake8]
|
[flake8]
|
||||||
|
|
Loading…
Reference in New Issue