diff --git a/src/metadata.yaml b/src/metadata.yaml index 0703f59..e57680b 100644 --- a/src/metadata.yaml +++ b/src/metadata.yaml @@ -11,15 +11,18 @@ description: | addition to its "native" API (the OpenStack API), it also supports the Amazon EC2 API. . - This charm provides the cloud controller service for OpenStack Nova cell - and includes nova-conductor service. + This charm provides the cloud controller service for the OpenStack Nova cell + 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: - openstack series: - - xenial - bionic - - artful - - trusty + # - cosmic # Pending LP https://bugs.launchpad.net/bugs/1804063 extra-bindings: public: admin: diff --git a/src/tests/bundles/cosmic-rocky.yaml b/src/tests/bundles/cosmic-rocky.yaml new file mode 100644 index 0000000..309a3cf --- /dev/null +++ b/src/tests/bundles/cosmic-rocky.yaml @@ -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 diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml index 0e502df..4edd313 100644 --- a/src/tests/tests.yaml +++ b/src/tests/tests.yaml @@ -9,5 +9,6 @@ configure: - zaza.charm_tests.nova.setup.manage_ssh_key gate_bundles: - bionic-rocky + # - cosmic-rocky # Pending LP https://bugs.launchpad.net/bugs/1804063 smoke_bundles: - bionic-rocky diff --git a/src/tox.ini b/src/tox.ini index 3b0b821..ce45106 100644 --- a/src/tox.ini +++ b/src/tox.ini @@ -12,7 +12,7 @@ install_command = pip install {opts} {packages} [testenv:pep8] -basepython = python2.7 +basepython = python3 deps=charm-tools commands = charm-proof diff --git a/tox.ini b/tox.ini index 06c404d..266fb54 100644 --- a/tox.ini +++ b/tox.ini @@ -3,8 +3,7 @@ # within individual charm repos. [tox] skipsdist = True -envlist = pep8,py34,py35 -skip_missing_interpreters = True +envlist = pep8,py3 [testenv] setenv = VIRTUAL_ENV={envdir} @@ -19,20 +18,12 @@ deps = -r{toxinidir}/requirements.txt [testenv:build] -basepython = python2.7 +basepython = python3 commands = charm-build --log-level DEBUG -o {toxinidir}/build src {posargs} -[testenv:py27] -basepython = python2.7 -# 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 +[testenv:py3] +basepython = python3 deps = -r{toxinidir}/test-requirements.txt commands = ostestr {posargs} @@ -47,11 +38,12 @@ deps = -r{toxinidir}/test-requirements.txt commands = ostestr {posargs} [testenv:pep8] -basepython = python3.5 +basepython = python3 deps = -r{toxinidir}/test-requirements.txt commands = flake8 {posargs} src unit_tests [testenv:venv] +basepython = python3 commands = {posargs} [flake8]