Migrate charm charmhub for stable/ussuri
- start from stable/ussuri branch - Do charmcraft, osci, zuul changes - Modify libs to point to stable/ussuri for: - charmhelpers - charms.openstack (as needed) - zaza & zaza.openstack.tests - Remove unsupported test bundles - migration bundles to charmhub.io (ch: prefix + channels) - Build on 18.04 amd64 - Run on 18.04 amd64, s390x, ppc64el, arm64 - Run on 20.04 amd64, s390x, ppc64el, arm64 Change-Id: If4226c00cff44fc9abaf482615347585ca24c9f6
This commit is contained in:
parent
267e440c9c
commit
ac581b2fdc
1
.gitignore
vendored
1
.gitignore
vendored
@ -13,3 +13,4 @@ xenial/
|
|||||||
.stestr
|
.stestr
|
||||||
__pycache__
|
__pycache__
|
||||||
func-results.json
|
func-results.json
|
||||||
|
*.charm
|
||||||
|
@ -3,4 +3,4 @@ host=review.opendev.org
|
|||||||
port=29418
|
port=29418
|
||||||
project=openstack/charm-neutron-api-plugin-arista.git
|
project=openstack/charm-neutron-api-plugin-arista.git
|
||||||
|
|
||||||
defaultbranch=stable/21.10
|
defaultbranch=stable/ussuri
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
- project:
|
- project:
|
||||||
templates:
|
templates:
|
||||||
- openstack-python3-charm-jobs
|
- openstack-python3-ussuri-jobs
|
||||||
- openstack-cover-jobs
|
- openstack-cover-jobs
|
||||||
|
7
build-requirements.txt
Normal file
7
build-requirements.txt
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
# NOTES(lourot):
|
||||||
|
# * We don't install charmcraft via pip anymore because it anyway spins up a
|
||||||
|
# container and scp the system's charmcraft snap inside it. So the charmcraft
|
||||||
|
# snap is necessary on the system anyway.
|
||||||
|
# * `tox -e build` successfully validated with charmcraft 1.2.1
|
||||||
|
|
||||||
|
cffi==1.14.6; python_version < '3.6' # cffi 1.15.0 drops support for py35.
|
34
charmcraft.yaml
Normal file
34
charmcraft.yaml
Normal file
@ -0,0 +1,34 @@
|
|||||||
|
type: charm
|
||||||
|
|
||||||
|
parts:
|
||||||
|
charm:
|
||||||
|
build-packages:
|
||||||
|
- git
|
||||||
|
- python3-dev
|
||||||
|
- python3-pip
|
||||||
|
override-build: |
|
||||||
|
apt-get install ca-certificates -y
|
||||||
|
pip3 install --user "tox==3.18"
|
||||||
|
~/.local/bin/tox -e build-reactive
|
||||||
|
override-stage: |
|
||||||
|
echo "Copying charm to staging area: $CHARMCRAFT_STAGE"
|
||||||
|
NAME=$(ls $CHARMCRAFT_PART_BUILD/build/builds)
|
||||||
|
cp -r $CHARMCRAFT_PART_BUILD/build/builds/$NAME/* $CHARMCRAFT_STAGE/
|
||||||
|
override-prime: |
|
||||||
|
# For some reason, the normal priming chokes on the fact that there's a
|
||||||
|
# hooks directory.
|
||||||
|
cp -r $CHARMCRAFT_STAGE/* .
|
||||||
|
|
||||||
|
bases:
|
||||||
|
- build-on:
|
||||||
|
- name: ubuntu
|
||||||
|
channel: "18.04"
|
||||||
|
architectures:
|
||||||
|
- amd64
|
||||||
|
run-on:
|
||||||
|
- name: ubuntu
|
||||||
|
channel: "18.04"
|
||||||
|
architectures: [amd64, s390x, ppc64el, arm64]
|
||||||
|
- name: ubuntu
|
||||||
|
channel: "20.04"
|
||||||
|
architectures: [amd64, s390x, ppc64el, arm64]
|
1
metadata.yaml
Symbolic link
1
metadata.yaml
Symbolic link
@ -0,0 +1 @@
|
|||||||
|
src/metadata.yaml
|
21
osci.yaml
21
osci.yaml
@ -1,21 +1,10 @@
|
|||||||
- project:
|
- project:
|
||||||
templates:
|
templates:
|
||||||
- charm-unit-jobs
|
- charm-unit-jobs-py36
|
||||||
check:
|
- charm-unit-jobs-py38
|
||||||
jobs:
|
- charm-train-functional-jobs
|
||||||
- bionic-queens
|
- charm-ussuri-functional-jobs
|
||||||
- bionic-stein
|
|
||||||
- bionic-train
|
|
||||||
- bionic-ussuri
|
|
||||||
- focal-ussuri
|
|
||||||
- focal-victoria
|
|
||||||
- focal-wallaby
|
|
||||||
- focal-xena:
|
|
||||||
voting: false
|
|
||||||
- groovy-victoria
|
|
||||||
- hirsute-wallaby
|
|
||||||
- impish-xena:
|
|
||||||
voting: false
|
|
||||||
vars:
|
vars:
|
||||||
needs_charm_build: true
|
needs_charm_build: true
|
||||||
charm_build_name: neutron-api-plugin-arista
|
charm_build_name: neutron-api-plugin-arista
|
||||||
|
build_type: charmcraft
|
||||||
|
13
rename.sh
Executable file
13
rename.sh
Executable file
@ -0,0 +1,13 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
charm=$(grep "charm_build_name" osci.yaml | awk '{print $2}')
|
||||||
|
echo "renaming ${charm}_*.charm to ${charm}.charm"
|
||||||
|
echo -n "pwd: "
|
||||||
|
pwd
|
||||||
|
ls -al
|
||||||
|
echo "Removing bad downloaded charm maybe?"
|
||||||
|
if [[ -e "${charm}.charm" ]];
|
||||||
|
then
|
||||||
|
rm "${charm}.charm"
|
||||||
|
fi
|
||||||
|
echo "Renaming charm here."
|
||||||
|
mv ${charm}_*.charm ${charm}.charm
|
@ -9,6 +9,7 @@
|
|||||||
setuptools<50.0.0 # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb244e9b27bc56750c44b7c85
|
setuptools<50.0.0 # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb244e9b27bc56750c44b7c85
|
||||||
|
|
||||||
# Build requirements
|
# Build requirements
|
||||||
|
pyparsing<3.0.0 # cffi needs pyparsing < 3.0.0.
|
||||||
cffi==1.14.6; python_version < '3.6' # cffi 1.15.0 drops support for py35.
|
cffi==1.14.6; python_version < '3.6' # cffi 1.15.0 drops support for py35.
|
||||||
charm-tools==2.8.3
|
charm-tools==2.8.3
|
||||||
|
|
||||||
|
@ -108,17 +108,11 @@
|
|||||||
"vcs": null,
|
"vcs": null,
|
||||||
"version": "1.1.1"
|
"version": "1.1.1"
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"type": "python_module",
|
|
||||||
"package": "Tempita",
|
|
||||||
"vcs": null,
|
|
||||||
"version": "0.4"
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"type": "python_module",
|
"type": "python_module",
|
||||||
"package": "charms.openstack",
|
"package": "charms.openstack",
|
||||||
"url": "git+https://github.com/openstack/charms.openstack.git",
|
"url": "git+https://github.com/openstack/charms.openstack.git",
|
||||||
"branch": "refs/heads/stable/21.10",
|
"branch": "stable/ussuri",
|
||||||
"version": "10627ee5f991c268f174d6d100e218a0e1867af1",
|
"version": "10627ee5f991c268f174d6d100e218a0e1867af1",
|
||||||
"vcs": "git"
|
"vcs": "git"
|
||||||
},
|
},
|
||||||
@ -138,8 +132,8 @@
|
|||||||
"type": "python_module",
|
"type": "python_module",
|
||||||
"package": "charmhelpers",
|
"package": "charmhelpers",
|
||||||
"url": "git+https://github.com/juju/charm-helpers.git",
|
"url": "git+https://github.com/juju/charm-helpers.git",
|
||||||
"branch": "refs/heads/stable/21.10",
|
"branch": "stable/ussuri",
|
||||||
"version": "26efcd0da51d580f68ead2ca13c38f58766f8a14",
|
"version": "a99a667d343ab3c11074d8bc8c6d8b5d638f73b7",
|
||||||
"vcs": "git"
|
"vcs": "git"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -2,17 +2,15 @@ name: neutron-api-plugin-arista
|
|||||||
summary: Arista ML2 plugin support for Neutron-API
|
summary: Arista ML2 plugin support for Neutron-API
|
||||||
maintainer: OpenStack Charmers <openstack-charmers@lists.ubuntu.com>
|
maintainer: OpenStack Charmers <openstack-charmers@lists.ubuntu.com>
|
||||||
description: |
|
description: |
|
||||||
|
Subordinate charm that deploys the Arista component on ``neutron-api`` units
|
||||||
|
and augments Neutron's configuration for use with Arista networking.
|
||||||
tags:
|
tags:
|
||||||
- misc
|
- misc
|
||||||
- networking
|
- networking
|
||||||
subordinate: true
|
subordinate: true
|
||||||
series:
|
series:
|
||||||
- xenial
|
- bionic
|
||||||
- bionic
|
- focal
|
||||||
- focal
|
|
||||||
- groovy
|
|
||||||
- hirsute
|
|
||||||
- impish
|
|
||||||
provides:
|
provides:
|
||||||
neutron-plugin-api-subordinate:
|
neutron-plugin-api-subordinate:
|
||||||
interface: neutron-plugin-api-subordinate
|
interface: neutron-plugin-api-subordinate
|
||||||
|
@ -5,5 +5,9 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
# Functional Test Requirements (let Zaza's dependencies solve all dependencies here!)
|
# Functional Test Requirements (let Zaza's dependencies solve all dependencies here!)
|
||||||
git+https://github.com/openstack-charmers/zaza.git@stable/21.10#egg=zaza
|
git+https://github.com/openstack-charmers/zaza.git@stable/ussuri#egg=zaza
|
||||||
git+https://github.com/openstack-charmers/zaza-openstack-tests.git@stable/21.10#egg=zaza.openstack
|
git+https://github.com/openstack-charmers/zaza-openstack-tests.git@stable/ussuri#egg=zaza.openstack
|
||||||
|
|
||||||
|
# Need tox to be available from tox... inception yes, but its a workaround for now
|
||||||
|
tox
|
||||||
|
|
||||||
|
@ -1,142 +0,0 @@
|
|||||||
variables:
|
|
||||||
openstack-origin: &openstack-origin distro
|
|
||||||
|
|
||||||
series: &series bionic
|
|
||||||
|
|
||||||
applications:
|
|
||||||
|
|
||||||
glance:
|
|
||||||
charm: cs:~openstack-charmers/glance
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
|
|
||||||
keystone:
|
|
||||||
charm: cs:~openstack-charmers/keystone
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
|
|
||||||
mysql:
|
|
||||||
charm: cs:~openstack-charmers/percona-cluster
|
|
||||||
num_units: 1
|
|
||||||
|
|
||||||
neutron-api:
|
|
||||||
charm: cs:~openstack-charmers/neutron-api
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
enable-ml2-dns: False
|
|
||||||
flat-network-providers: default
|
|
||||||
vlan-ranges: default:1000:3000
|
|
||||||
vni-ranges: 1001:2000
|
|
||||||
neutron-security-groups: True
|
|
||||||
overlay-network-type: vxlan
|
|
||||||
use-internal-endpoints: True
|
|
||||||
enable-l3ha: True
|
|
||||||
dhcp-agents-per-network: 2
|
|
||||||
enable-ml2-port-security: True
|
|
||||||
default-tenant-network-type: vlan
|
|
||||||
l2-population: False
|
|
||||||
ipv4-ptr-zone-prefix-size:
|
|
||||||
reverse-dns-lookup: False
|
|
||||||
dns-domain:
|
|
||||||
manage-neutron-plugin-legacy-mode: False
|
|
||||||
|
|
||||||
neutron-openvswitch:
|
|
||||||
charm: cs:~openstack-charmers/neutron-openvswitch
|
|
||||||
num_units: 0
|
|
||||||
options:
|
|
||||||
prevent-arp-spoofing: True
|
|
||||||
firewall-driver: openvswitch
|
|
||||||
enable-local-dhcp-and-metadata: True
|
|
||||||
bridge-mappings: default:br-data
|
|
||||||
data-port: ens7
|
|
||||||
|
|
||||||
nova-cloud-controller:
|
|
||||||
charm: cs:~openstack-charmers/nova-cloud-controller
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
network-manager: Neutron
|
|
||||||
|
|
||||||
neutron-api-plugin-arista:
|
|
||||||
charm: ../../../neutron-api-plugin-arista
|
|
||||||
num_units: 0
|
|
||||||
options:
|
|
||||||
# Fake IP, will be set to arista-virt-test-fixture's IP address on test
|
|
||||||
# setup:
|
|
||||||
eapi-host: 192.0.2.42
|
|
||||||
eapi-username: admin
|
|
||||||
eapi-password: password123
|
|
||||||
api-type: EAPI
|
|
||||||
|
|
||||||
nova-compute:
|
|
||||||
charm: cs:~openstack-charmers/nova-compute
|
|
||||||
num_units: 2
|
|
||||||
constraints: mem=4G cores=4
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
config-flags: default_ephemeral_format=ext4
|
|
||||||
enable-live-migration: true
|
|
||||||
enable-resize: true
|
|
||||||
migration-auth-type: ssh
|
|
||||||
|
|
||||||
rabbitmq-server:
|
|
||||||
charm: cs:~openstack-charmers/rabbitmq-server
|
|
||||||
num_units: 1
|
|
||||||
|
|
||||||
lldpd:
|
|
||||||
charm: cs:lldpd
|
|
||||||
options:
|
|
||||||
interfaces-regex: 'en*'
|
|
||||||
short-name: true
|
|
||||||
|
|
||||||
arista-virt-test-fixture:
|
|
||||||
charm: cs:~openstack-charmers-next/arista-virt-test-fixture
|
|
||||||
num_units: 1
|
|
||||||
constraints: mem=4G
|
|
||||||
|
|
||||||
relations:
|
|
||||||
- - nova-compute:amqp
|
|
||||||
- rabbitmq-server: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:amqp
|
|
||||||
- - glance:shared-db
|
|
||||||
- mysql:shared-db
|
|
||||||
- - glance:amqp
|
|
||||||
- rabbitmq-server:amqp
|
|
||||||
- - nova-cloud-controller:image-service
|
|
||||||
- glance:image-service
|
|
||||||
- - nova-compute:image-service
|
|
||||||
- glance:image-service
|
|
||||||
- - nova-cloud-controller:cloud-compute
|
|
||||||
- nova-compute:cloud-compute
|
|
||||||
- - nova-cloud-controller:amqp
|
|
||||||
- rabbitmq-server:amqp
|
|
||||||
- - nova-compute:neutron-plugin
|
|
||||||
- neutron-openvswitch:neutron-plugin
|
|
||||||
- - neutron-openvswitch:amqp
|
|
||||||
- rabbitmq-server:amqp
|
|
||||||
- - nova-cloud-controller:shared-db
|
|
||||||
- mysql:shared-db
|
|
||||||
- - nova-cloud-controller:neutron-api
|
|
||||||
- neutron-api:neutron-api
|
|
||||||
- - neutron-api
|
|
||||||
- neutron-api-plugin-arista
|
|
||||||
- - neutron-api:neutron-plugin-api-subordinate
|
|
||||||
- neutron-api-plugin-arista:neutron-plugin-api-subordinate
|
|
||||||
- - lldpd
|
|
||||||
- nova-compute
|
|
@ -1,145 +0,0 @@
|
|||||||
variables:
|
|
||||||
openstack-origin: &openstack-origin cloud:bionic-rocky
|
|
||||||
|
|
||||||
series: &series bionic
|
|
||||||
|
|
||||||
applications:
|
|
||||||
|
|
||||||
glance:
|
|
||||||
charm: cs:~openstack-charmers/glance
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
|
|
||||||
keystone:
|
|
||||||
charm: cs:~openstack-charmers/keystone
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
|
|
||||||
mysql:
|
|
||||||
charm: cs:~openstack-charmers/percona-cluster
|
|
||||||
num_units: 1
|
|
||||||
|
|
||||||
neutron-api:
|
|
||||||
charm: cs:~openstack-charmers/neutron-api
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
enable-ml2-dns: False
|
|
||||||
flat-network-providers: default
|
|
||||||
vlan-ranges: default:1000:3000
|
|
||||||
vni-ranges: 1001:2000
|
|
||||||
neutron-security-groups: True
|
|
||||||
overlay-network-type: vxlan
|
|
||||||
use-internal-endpoints: True
|
|
||||||
enable-l3ha: True
|
|
||||||
dhcp-agents-per-network: 2
|
|
||||||
enable-ml2-port-security: True
|
|
||||||
default-tenant-network-type: vlan
|
|
||||||
l2-population: False
|
|
||||||
ipv4-ptr-zone-prefix-size:
|
|
||||||
reverse-dns-lookup: False
|
|
||||||
dns-domain:
|
|
||||||
manage-neutron-plugin-legacy-mode: False
|
|
||||||
|
|
||||||
neutron-openvswitch:
|
|
||||||
charm: cs:~openstack-charmers/neutron-openvswitch
|
|
||||||
num_units: 0
|
|
||||||
options:
|
|
||||||
prevent-arp-spoofing: True
|
|
||||||
firewall-driver: openvswitch
|
|
||||||
enable-local-dhcp-and-metadata: True
|
|
||||||
bridge-mappings: default:br-data
|
|
||||||
data-port: ens7
|
|
||||||
|
|
||||||
nova-cloud-controller:
|
|
||||||
charm: cs:~openstack-charmers/nova-cloud-controller
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
network-manager: Neutron
|
|
||||||
|
|
||||||
neutron-api-plugin-arista:
|
|
||||||
charm: ../../../neutron-api-plugin-arista
|
|
||||||
num_units: 0
|
|
||||||
options:
|
|
||||||
# Contains fix for lp:1889396
|
|
||||||
source: ppa:aurelien-lourot/arista-rocky
|
|
||||||
|
|
||||||
# Fake IP, will be set to arista-virt-test-fixture's IP address on test
|
|
||||||
# setup:
|
|
||||||
eapi-host: 192.0.2.42
|
|
||||||
eapi-username: admin
|
|
||||||
eapi-password: password123
|
|
||||||
api-type: EAPI
|
|
||||||
|
|
||||||
nova-compute:
|
|
||||||
charm: cs:~openstack-charmers/nova-compute
|
|
||||||
num_units: 2
|
|
||||||
constraints: mem=4G cores=4
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
config-flags: default_ephemeral_format=ext4
|
|
||||||
enable-live-migration: true
|
|
||||||
enable-resize: true
|
|
||||||
migration-auth-type: ssh
|
|
||||||
|
|
||||||
rabbitmq-server:
|
|
||||||
charm: cs:~openstack-charmers/rabbitmq-server
|
|
||||||
num_units: 1
|
|
||||||
|
|
||||||
lldpd:
|
|
||||||
charm: cs:lldpd
|
|
||||||
options:
|
|
||||||
interfaces-regex: 'en*'
|
|
||||||
short-name: true
|
|
||||||
|
|
||||||
arista-virt-test-fixture:
|
|
||||||
charm: cs:~openstack-charmers-next/arista-virt-test-fixture
|
|
||||||
num_units: 1
|
|
||||||
constraints: mem=4G
|
|
||||||
|
|
||||||
relations:
|
|
||||||
- - nova-compute:amqp
|
|
||||||
- rabbitmq-server: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:amqp
|
|
||||||
- - glance:shared-db
|
|
||||||
- mysql:shared-db
|
|
||||||
- - glance:amqp
|
|
||||||
- rabbitmq-server:amqp
|
|
||||||
- - nova-cloud-controller:image-service
|
|
||||||
- glance:image-service
|
|
||||||
- - nova-compute:image-service
|
|
||||||
- glance:image-service
|
|
||||||
- - nova-cloud-controller:cloud-compute
|
|
||||||
- nova-compute:cloud-compute
|
|
||||||
- - nova-cloud-controller:amqp
|
|
||||||
- rabbitmq-server:amqp
|
|
||||||
- - nova-compute:neutron-plugin
|
|
||||||
- neutron-openvswitch:neutron-plugin
|
|
||||||
- - neutron-openvswitch:amqp
|
|
||||||
- rabbitmq-server:amqp
|
|
||||||
- - nova-cloud-controller:shared-db
|
|
||||||
- mysql:shared-db
|
|
||||||
- - nova-cloud-controller:neutron-api
|
|
||||||
- neutron-api:neutron-api
|
|
||||||
- - neutron-api
|
|
||||||
- neutron-api-plugin-arista
|
|
||||||
- - neutron-api:neutron-plugin-api-subordinate
|
|
||||||
- neutron-api-plugin-arista:neutron-plugin-api-subordinate
|
|
||||||
- - lldpd
|
|
||||||
- nova-compute
|
|
@ -1,142 +0,0 @@
|
|||||||
variables:
|
|
||||||
openstack-origin: &openstack-origin cloud:bionic-stein
|
|
||||||
|
|
||||||
series: &series bionic
|
|
||||||
|
|
||||||
applications:
|
|
||||||
|
|
||||||
glance:
|
|
||||||
charm: cs:~openstack-charmers/glance
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
|
|
||||||
keystone:
|
|
||||||
charm: cs:~openstack-charmers/keystone
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
|
|
||||||
mysql:
|
|
||||||
charm: cs:~openstack-charmers/percona-cluster
|
|
||||||
num_units: 1
|
|
||||||
|
|
||||||
neutron-api:
|
|
||||||
charm: cs:~openstack-charmers/neutron-api
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
enable-ml2-dns: False
|
|
||||||
flat-network-providers: default
|
|
||||||
vlan-ranges: default:1000:3000
|
|
||||||
vni-ranges: 1001:2000
|
|
||||||
neutron-security-groups: True
|
|
||||||
overlay-network-type: vxlan
|
|
||||||
use-internal-endpoints: True
|
|
||||||
enable-l3ha: True
|
|
||||||
dhcp-agents-per-network: 2
|
|
||||||
enable-ml2-port-security: True
|
|
||||||
default-tenant-network-type: vlan
|
|
||||||
l2-population: False
|
|
||||||
ipv4-ptr-zone-prefix-size:
|
|
||||||
reverse-dns-lookup: False
|
|
||||||
dns-domain:
|
|
||||||
manage-neutron-plugin-legacy-mode: False
|
|
||||||
|
|
||||||
neutron-openvswitch:
|
|
||||||
charm: cs:~openstack-charmers/neutron-openvswitch
|
|
||||||
num_units: 0
|
|
||||||
options:
|
|
||||||
prevent-arp-spoofing: True
|
|
||||||
firewall-driver: openvswitch
|
|
||||||
enable-local-dhcp-and-metadata: True
|
|
||||||
bridge-mappings: default:br-data
|
|
||||||
data-port: ens7
|
|
||||||
|
|
||||||
nova-cloud-controller:
|
|
||||||
charm: cs:~openstack-charmers/nova-cloud-controller
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
network-manager: Neutron
|
|
||||||
|
|
||||||
neutron-api-plugin-arista:
|
|
||||||
charm: ../../../neutron-api-plugin-arista
|
|
||||||
num_units: 0
|
|
||||||
options:
|
|
||||||
# Fake IP, will be set to arista-virt-test-fixture's IP address on test
|
|
||||||
# setup:
|
|
||||||
eapi-host: 192.0.2.42
|
|
||||||
eapi-username: admin
|
|
||||||
eapi-password: password123
|
|
||||||
api-type: EAPI
|
|
||||||
|
|
||||||
nova-compute:
|
|
||||||
charm: cs:~openstack-charmers/nova-compute
|
|
||||||
num_units: 2
|
|
||||||
constraints: mem=4G cores=4
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
config-flags: default_ephemeral_format=ext4
|
|
||||||
enable-live-migration: true
|
|
||||||
enable-resize: true
|
|
||||||
migration-auth-type: ssh
|
|
||||||
|
|
||||||
rabbitmq-server:
|
|
||||||
charm: cs:~openstack-charmers/rabbitmq-server
|
|
||||||
num_units: 1
|
|
||||||
|
|
||||||
lldpd:
|
|
||||||
charm: cs:lldpd
|
|
||||||
options:
|
|
||||||
interfaces-regex: 'en*'
|
|
||||||
short-name: true
|
|
||||||
|
|
||||||
arista-virt-test-fixture:
|
|
||||||
charm: cs:~openstack-charmers-next/arista-virt-test-fixture
|
|
||||||
num_units: 1
|
|
||||||
constraints: mem=4G
|
|
||||||
|
|
||||||
relations:
|
|
||||||
- - nova-compute:amqp
|
|
||||||
- rabbitmq-server: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:amqp
|
|
||||||
- - glance:shared-db
|
|
||||||
- mysql:shared-db
|
|
||||||
- - glance:amqp
|
|
||||||
- rabbitmq-server:amqp
|
|
||||||
- - nova-cloud-controller:image-service
|
|
||||||
- glance:image-service
|
|
||||||
- - nova-compute:image-service
|
|
||||||
- glance:image-service
|
|
||||||
- - nova-cloud-controller:cloud-compute
|
|
||||||
- nova-compute:cloud-compute
|
|
||||||
- - nova-cloud-controller:amqp
|
|
||||||
- rabbitmq-server:amqp
|
|
||||||
- - nova-compute:neutron-plugin
|
|
||||||
- neutron-openvswitch:neutron-plugin
|
|
||||||
- - neutron-openvswitch:amqp
|
|
||||||
- rabbitmq-server:amqp
|
|
||||||
- - nova-cloud-controller:shared-db
|
|
||||||
- mysql:shared-db
|
|
||||||
- - nova-cloud-controller:neutron-api
|
|
||||||
- neutron-api:neutron-api
|
|
||||||
- - neutron-api
|
|
||||||
- neutron-api-plugin-arista
|
|
||||||
- - neutron-api:neutron-plugin-api-subordinate
|
|
||||||
- neutron-api-plugin-arista:neutron-plugin-api-subordinate
|
|
||||||
- - lldpd
|
|
||||||
- nova-compute
|
|
@ -1,3 +1,5 @@
|
|||||||
|
local_overlay_enabled: False
|
||||||
|
|
||||||
variables:
|
variables:
|
||||||
openstack-origin: &openstack-origin cloud:bionic-train
|
openstack-origin: &openstack-origin cloud:bionic-train
|
||||||
|
|
||||||
@ -6,23 +8,26 @@ series: &series bionic
|
|||||||
applications:
|
applications:
|
||||||
|
|
||||||
glance:
|
glance:
|
||||||
charm: cs:~openstack-charmers/glance
|
charm: ch:glance
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
|
channel: ussuri/edge
|
||||||
|
|
||||||
keystone:
|
keystone:
|
||||||
charm: cs:~openstack-charmers/keystone
|
charm: ch:keystone
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
|
channel: ussuri/edge
|
||||||
|
|
||||||
mysql:
|
mysql:
|
||||||
charm: cs:~openstack-charmers/percona-cluster
|
charm: ch:percona-cluster
|
||||||
num_units: 1
|
num_units: 1
|
||||||
|
channel: 5.7/edge
|
||||||
|
|
||||||
neutron-api:
|
neutron-api:
|
||||||
charm: cs:~openstack-charmers/neutron-api
|
charm: ch:neutron-api
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
@ -42,9 +47,10 @@ applications:
|
|||||||
reverse-dns-lookup: False
|
reverse-dns-lookup: False
|
||||||
dns-domain:
|
dns-domain:
|
||||||
manage-neutron-plugin-legacy-mode: False
|
manage-neutron-plugin-legacy-mode: False
|
||||||
|
channel: ussuri/edge
|
||||||
|
|
||||||
neutron-openvswitch:
|
neutron-openvswitch:
|
||||||
charm: cs:~openstack-charmers/neutron-openvswitch
|
charm: ch:neutron-openvswitch
|
||||||
num_units: 0
|
num_units: 0
|
||||||
options:
|
options:
|
||||||
prevent-arp-spoofing: True
|
prevent-arp-spoofing: True
|
||||||
@ -52,16 +58,18 @@ applications:
|
|||||||
enable-local-dhcp-and-metadata: True
|
enable-local-dhcp-and-metadata: True
|
||||||
bridge-mappings: default:br-data
|
bridge-mappings: default:br-data
|
||||||
data-port: ens7
|
data-port: ens7
|
||||||
|
channel: ussuri/edge
|
||||||
|
|
||||||
nova-cloud-controller:
|
nova-cloud-controller:
|
||||||
charm: cs:~openstack-charmers/nova-cloud-controller
|
charm: ch:nova-cloud-controller
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
network-manager: Neutron
|
network-manager: Neutron
|
||||||
|
channel: ussuri/edge
|
||||||
|
|
||||||
neutron-api-plugin-arista:
|
neutron-api-plugin-arista:
|
||||||
charm: ../../../neutron-api-plugin-arista
|
charm: ../../../neutron-api-plugin-arista.charm
|
||||||
num_units: 0
|
num_units: 0
|
||||||
options:
|
options:
|
||||||
# Fake IP, will be set to arista-virt-test-fixture's IP address on test
|
# Fake IP, will be set to arista-virt-test-fixture's IP address on test
|
||||||
@ -72,13 +80,14 @@ applications:
|
|||||||
api-type: EAPI
|
api-type: EAPI
|
||||||
|
|
||||||
placement:
|
placement:
|
||||||
charm: cs:~openstack-charmers/placement
|
charm: ch:placement
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
|
channel: ussuri/edge
|
||||||
|
|
||||||
nova-compute:
|
nova-compute:
|
||||||
charm: cs:~openstack-charmers/nova-compute
|
charm: ch:nova-compute
|
||||||
num_units: 2
|
num_units: 2
|
||||||
constraints: mem=4G cores=4
|
constraints: mem=4G cores=4
|
||||||
options:
|
options:
|
||||||
@ -87,10 +96,12 @@ applications:
|
|||||||
enable-live-migration: true
|
enable-live-migration: true
|
||||||
enable-resize: true
|
enable-resize: true
|
||||||
migration-auth-type: ssh
|
migration-auth-type: ssh
|
||||||
|
channel: ussuri/edge
|
||||||
|
|
||||||
rabbitmq-server:
|
rabbitmq-server:
|
||||||
charm: cs:~openstack-charmers/rabbitmq-server
|
charm: ch:rabbitmq-server
|
||||||
num_units: 1
|
num_units: 1
|
||||||
|
channel: 3.8/edge
|
||||||
|
|
||||||
lldpd:
|
lldpd:
|
||||||
charm: cs:lldpd
|
charm: cs:lldpd
|
||||||
@ -99,9 +110,10 @@ applications:
|
|||||||
short-name: true
|
short-name: true
|
||||||
|
|
||||||
arista-virt-test-fixture:
|
arista-virt-test-fixture:
|
||||||
charm: cs:~openstack-charmers-next/arista-virt-test-fixture
|
charm: ch:openstack-charmers-next-arista-virt-test-fixture
|
||||||
num_units: 1
|
num_units: 1
|
||||||
constraints: mem=4G
|
constraints: mem=4G
|
||||||
|
series: focal
|
||||||
|
|
||||||
relations:
|
relations:
|
||||||
- - nova-compute:amqp
|
- - nova-compute:amqp
|
||||||
|
@ -1,3 +1,5 @@
|
|||||||
|
local_overlay_enabled: False
|
||||||
|
|
||||||
variables:
|
variables:
|
||||||
openstack-origin: &openstack-origin cloud:bionic-ussuri
|
openstack-origin: &openstack-origin cloud:bionic-ussuri
|
||||||
|
|
||||||
@ -6,23 +8,26 @@ series: &series bionic
|
|||||||
applications:
|
applications:
|
||||||
|
|
||||||
glance:
|
glance:
|
||||||
charm: cs:~openstack-charmers/glance
|
charm: ch:glance
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
|
channel: ussuri/edge
|
||||||
|
|
||||||
keystone:
|
keystone:
|
||||||
charm: cs:~openstack-charmers/keystone
|
charm: ch:keystone
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
|
channel: ussuri/edge
|
||||||
|
|
||||||
mysql:
|
mysql:
|
||||||
charm: cs:~openstack-charmers/percona-cluster
|
charm: ch:percona-cluster
|
||||||
num_units: 1
|
num_units: 1
|
||||||
|
channel: 5.7/edge
|
||||||
|
|
||||||
neutron-api:
|
neutron-api:
|
||||||
charm: cs:~openstack-charmers/neutron-api
|
charm: ch:neutron-api
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
@ -42,9 +47,10 @@ applications:
|
|||||||
reverse-dns-lookup: False
|
reverse-dns-lookup: False
|
||||||
dns-domain:
|
dns-domain:
|
||||||
manage-neutron-plugin-legacy-mode: False
|
manage-neutron-plugin-legacy-mode: False
|
||||||
|
channel: ussuri/edge
|
||||||
|
|
||||||
neutron-openvswitch:
|
neutron-openvswitch:
|
||||||
charm: cs:~openstack-charmers/neutron-openvswitch
|
charm: ch:neutron-openvswitch
|
||||||
num_units: 0
|
num_units: 0
|
||||||
options:
|
options:
|
||||||
prevent-arp-spoofing: True
|
prevent-arp-spoofing: True
|
||||||
@ -52,16 +58,18 @@ applications:
|
|||||||
enable-local-dhcp-and-metadata: True
|
enable-local-dhcp-and-metadata: True
|
||||||
bridge-mappings: default:br-data
|
bridge-mappings: default:br-data
|
||||||
data-port: ens7
|
data-port: ens7
|
||||||
|
channel: ussuri/edge
|
||||||
|
|
||||||
nova-cloud-controller:
|
nova-cloud-controller:
|
||||||
charm: cs:~openstack-charmers/nova-cloud-controller
|
charm: ch:nova-cloud-controller
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
network-manager: Neutron
|
network-manager: Neutron
|
||||||
|
channel: ussuri/edge
|
||||||
|
|
||||||
neutron-api-plugin-arista:
|
neutron-api-plugin-arista:
|
||||||
charm: ../../../neutron-api-plugin-arista
|
charm: ../../../neutron-api-plugin-arista.charm
|
||||||
num_units: 0
|
num_units: 0
|
||||||
options:
|
options:
|
||||||
# Fake IP, will be set to arista-virt-test-fixture's IP address on test
|
# Fake IP, will be set to arista-virt-test-fixture's IP address on test
|
||||||
@ -72,13 +80,14 @@ applications:
|
|||||||
api-type: EAPI
|
api-type: EAPI
|
||||||
|
|
||||||
placement:
|
placement:
|
||||||
charm: cs:~openstack-charmers/placement
|
charm: ch:placement
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
|
channel: ussuri/edge
|
||||||
|
|
||||||
nova-compute:
|
nova-compute:
|
||||||
charm: cs:~openstack-charmers/nova-compute
|
charm: ch:nova-compute
|
||||||
num_units: 2
|
num_units: 2
|
||||||
constraints: mem=4G cores=4
|
constraints: mem=4G cores=4
|
||||||
options:
|
options:
|
||||||
@ -87,10 +96,12 @@ applications:
|
|||||||
enable-live-migration: true
|
enable-live-migration: true
|
||||||
enable-resize: true
|
enable-resize: true
|
||||||
migration-auth-type: ssh
|
migration-auth-type: ssh
|
||||||
|
channel: ussuri/edge
|
||||||
|
|
||||||
rabbitmq-server:
|
rabbitmq-server:
|
||||||
charm: cs:~openstack-charmers/rabbitmq-server
|
charm: ch:rabbitmq-server
|
||||||
num_units: 1
|
num_units: 1
|
||||||
|
channel: 3.8/edge
|
||||||
|
|
||||||
lldpd:
|
lldpd:
|
||||||
charm: cs:lldpd
|
charm: cs:lldpd
|
||||||
@ -99,9 +110,10 @@ applications:
|
|||||||
short-name: true
|
short-name: true
|
||||||
|
|
||||||
arista-virt-test-fixture:
|
arista-virt-test-fixture:
|
||||||
charm: cs:~openstack-charmers-next/arista-virt-test-fixture
|
charm: ch:openstack-charmers-next-arista-virt-test-fixture
|
||||||
num_units: 1
|
num_units: 1
|
||||||
constraints: mem=4G
|
constraints: mem=4G
|
||||||
|
series: focal
|
||||||
|
|
||||||
relations:
|
relations:
|
||||||
- - nova-compute:amqp
|
- - nova-compute:amqp
|
||||||
|
@ -1,3 +1,5 @@
|
|||||||
|
local_overlay_enabled: False
|
||||||
|
|
||||||
variables:
|
variables:
|
||||||
openstack-origin: &openstack-origin distro
|
openstack-origin: &openstack-origin distro
|
||||||
|
|
||||||
@ -6,36 +8,44 @@ series: &series focal
|
|||||||
applications:
|
applications:
|
||||||
|
|
||||||
keystone-mysql-router:
|
keystone-mysql-router:
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
charm: ch:mysql-router
|
||||||
|
channel: 8.0/edge
|
||||||
nova-mysql-router:
|
nova-mysql-router:
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
charm: ch:mysql-router
|
||||||
|
channel: 8.0/edge
|
||||||
glance-mysql-router:
|
glance-mysql-router:
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
charm: ch:mysql-router
|
||||||
|
channel: 8.0/edge
|
||||||
neutron-mysql-router:
|
neutron-mysql-router:
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
charm: ch:mysql-router
|
||||||
|
channel: 8.0/edge
|
||||||
placement-mysql-router:
|
placement-mysql-router:
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
charm: ch:mysql-router
|
||||||
|
channel: 8.0/edge
|
||||||
mysql-innodb-cluster:
|
mysql-innodb-cluster:
|
||||||
constraints: mem=3072M
|
constraints: mem=3072M
|
||||||
charm: cs:~openstack-charmers/mysql-innodb-cluster
|
charm: ch:mysql-innodb-cluster
|
||||||
num_units: 3
|
num_units: 3
|
||||||
options:
|
options:
|
||||||
source: *openstack-origin
|
source: *openstack-origin
|
||||||
|
channel: 8.0/edge
|
||||||
|
|
||||||
glance:
|
glance:
|
||||||
charm: cs:~openstack-charmers/glance
|
charm: ch:glance
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
|
channel: ussuri/edge
|
||||||
|
|
||||||
keystone:
|
keystone:
|
||||||
charm: cs:~openstack-charmers/keystone
|
charm: ch:keystone
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
|
channel: ussuri/edge
|
||||||
|
|
||||||
neutron-api:
|
neutron-api:
|
||||||
charm: cs:~openstack-charmers/neutron-api
|
charm: ch:neutron-api
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
@ -55,9 +65,10 @@ applications:
|
|||||||
reverse-dns-lookup: False
|
reverse-dns-lookup: False
|
||||||
dns-domain:
|
dns-domain:
|
||||||
manage-neutron-plugin-legacy-mode: False
|
manage-neutron-plugin-legacy-mode: False
|
||||||
|
channel: ussuri/edge
|
||||||
|
|
||||||
neutron-openvswitch:
|
neutron-openvswitch:
|
||||||
charm: cs:~openstack-charmers/neutron-openvswitch
|
charm: ch:neutron-openvswitch
|
||||||
num_units: 0
|
num_units: 0
|
||||||
options:
|
options:
|
||||||
prevent-arp-spoofing: True
|
prevent-arp-spoofing: True
|
||||||
@ -65,16 +76,18 @@ applications:
|
|||||||
enable-local-dhcp-and-metadata: True
|
enable-local-dhcp-and-metadata: True
|
||||||
bridge-mappings: default:br-data
|
bridge-mappings: default:br-data
|
||||||
data-port: ens7
|
data-port: ens7
|
||||||
|
channel: ussuri/edge
|
||||||
|
|
||||||
nova-cloud-controller:
|
nova-cloud-controller:
|
||||||
charm: cs:~openstack-charmers/nova-cloud-controller
|
charm: ch:nova-cloud-controller
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
network-manager: Neutron
|
network-manager: Neutron
|
||||||
|
channel: ussuri/edge
|
||||||
|
|
||||||
neutron-api-plugin-arista:
|
neutron-api-plugin-arista:
|
||||||
charm: ../../../neutron-api-plugin-arista
|
charm: ../../../neutron-api-plugin-arista.charm
|
||||||
num_units: 0
|
num_units: 0
|
||||||
options:
|
options:
|
||||||
source: *openstack-origin
|
source: *openstack-origin
|
||||||
@ -87,13 +100,14 @@ applications:
|
|||||||
api-type: EAPI
|
api-type: EAPI
|
||||||
|
|
||||||
placement:
|
placement:
|
||||||
charm: cs:~openstack-charmers/placement
|
charm: ch:placement
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
|
channel: ussuri/edge
|
||||||
|
|
||||||
nova-compute:
|
nova-compute:
|
||||||
charm: cs:~openstack-charmers/nova-compute
|
charm: ch:nova-compute
|
||||||
num_units: 2
|
num_units: 2
|
||||||
constraints: mem=4G cores=4
|
constraints: mem=4G cores=4
|
||||||
options:
|
options:
|
||||||
@ -102,10 +116,12 @@ applications:
|
|||||||
enable-live-migration: true
|
enable-live-migration: true
|
||||||
enable-resize: true
|
enable-resize: true
|
||||||
migration-auth-type: ssh
|
migration-auth-type: ssh
|
||||||
|
channel: ussuri/edge
|
||||||
|
|
||||||
rabbitmq-server:
|
rabbitmq-server:
|
||||||
charm: cs:~openstack-charmers/rabbitmq-server
|
charm: ch:rabbitmq-server
|
||||||
num_units: 1
|
num_units: 1
|
||||||
|
channel: 3.8/edge
|
||||||
|
|
||||||
lldpd:
|
lldpd:
|
||||||
charm: cs:lldpd
|
charm: cs:lldpd
|
||||||
@ -114,7 +130,7 @@ applications:
|
|||||||
short-name: true
|
short-name: true
|
||||||
|
|
||||||
arista-virt-test-fixture:
|
arista-virt-test-fixture:
|
||||||
charm: cs:~openstack-charmers-next/arista-virt-test-fixture
|
charm: ch:openstack-charmers-next-arista-virt-test-fixture
|
||||||
num_units: 1
|
num_units: 1
|
||||||
constraints: mem=4G
|
constraints: mem=4G
|
||||||
|
|
||||||
|
@ -1,180 +0,0 @@
|
|||||||
variables:
|
|
||||||
openstack-origin: &openstack-origin cloud:focal-victoria
|
|
||||||
|
|
||||||
series: &series focal
|
|
||||||
|
|
||||||
applications:
|
|
||||||
|
|
||||||
keystone-mysql-router:
|
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
|
||||||
nova-mysql-router:
|
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
|
||||||
glance-mysql-router:
|
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
|
||||||
neutron-mysql-router:
|
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
|
||||||
placement-mysql-router:
|
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
|
||||||
mysql-innodb-cluster:
|
|
||||||
constraints: mem=3072M
|
|
||||||
charm: cs:~openstack-charmers/mysql-innodb-cluster
|
|
||||||
num_units: 3
|
|
||||||
options:
|
|
||||||
source: *openstack-origin
|
|
||||||
|
|
||||||
glance:
|
|
||||||
charm: cs:~openstack-charmers/glance
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
|
|
||||||
keystone:
|
|
||||||
charm: cs:~openstack-charmers/keystone
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
|
|
||||||
neutron-api:
|
|
||||||
charm: cs:~openstack-charmers/neutron-api
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
enable-ml2-dns: False
|
|
||||||
flat-network-providers: default
|
|
||||||
vlan-ranges: default:1000:3000
|
|
||||||
vni-ranges: 1001:2000
|
|
||||||
neutron-security-groups: True
|
|
||||||
overlay-network-type: vxlan
|
|
||||||
use-internal-endpoints: True
|
|
||||||
enable-l3ha: True
|
|
||||||
dhcp-agents-per-network: 2
|
|
||||||
enable-ml2-port-security: True
|
|
||||||
default-tenant-network-type: vlan
|
|
||||||
l2-population: False
|
|
||||||
ipv4-ptr-zone-prefix-size:
|
|
||||||
reverse-dns-lookup: False
|
|
||||||
dns-domain:
|
|
||||||
manage-neutron-plugin-legacy-mode: False
|
|
||||||
|
|
||||||
neutron-openvswitch:
|
|
||||||
charm: cs:~openstack-charmers/neutron-openvswitch
|
|
||||||
num_units: 0
|
|
||||||
options:
|
|
||||||
prevent-arp-spoofing: True
|
|
||||||
firewall-driver: openvswitch
|
|
||||||
enable-local-dhcp-and-metadata: True
|
|
||||||
bridge-mappings: default:br-data
|
|
||||||
data-port: ens7
|
|
||||||
|
|
||||||
nova-cloud-controller:
|
|
||||||
charm: cs:~openstack-charmers/nova-cloud-controller
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
network-manager: Neutron
|
|
||||||
|
|
||||||
neutron-api-plugin-arista:
|
|
||||||
charm: ../../../neutron-api-plugin-arista
|
|
||||||
num_units: 0
|
|
||||||
options:
|
|
||||||
source: *openstack-origin
|
|
||||||
|
|
||||||
# Fake IP, will be set to arista-virt-test-fixture's IP address on test
|
|
||||||
# setup:
|
|
||||||
eapi-host: 192.0.2.42
|
|
||||||
eapi-username: admin
|
|
||||||
eapi-password: password123
|
|
||||||
api-type: EAPI
|
|
||||||
|
|
||||||
placement:
|
|
||||||
charm: cs:~openstack-charmers/placement
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
|
|
||||||
nova-compute:
|
|
||||||
charm: cs:~openstack-charmers/nova-compute
|
|
||||||
num_units: 2
|
|
||||||
constraints: mem=4G cores=4
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
config-flags: default_ephemeral_format=ext4
|
|
||||||
enable-live-migration: true
|
|
||||||
enable-resize: true
|
|
||||||
migration-auth-type: ssh
|
|
||||||
|
|
||||||
rabbitmq-server:
|
|
||||||
charm: cs:~openstack-charmers/rabbitmq-server
|
|
||||||
num_units: 1
|
|
||||||
|
|
||||||
lldpd:
|
|
||||||
charm: cs:lldpd
|
|
||||||
options:
|
|
||||||
interfaces-regex: 'en*'
|
|
||||||
short-name: true
|
|
||||||
|
|
||||||
arista-virt-test-fixture:
|
|
||||||
charm: cs:~openstack-charmers-next/arista-virt-test-fixture
|
|
||||||
num_units: 1
|
|
||||||
constraints: mem=4G
|
|
||||||
|
|
||||||
relations:
|
|
||||||
- - keystone:shared-db
|
|
||||||
- keystone-mysql-router:shared-db
|
|
||||||
- - nova-cloud-controller:shared-db
|
|
||||||
- nova-mysql-router:shared-db
|
|
||||||
- - glance:shared-db
|
|
||||||
- glance-mysql-router:shared-db
|
|
||||||
- - neutron-api:shared-db
|
|
||||||
- neutron-mysql-router:shared-db
|
|
||||||
- - placement:shared-db
|
|
||||||
- placement-mysql-router:shared-db
|
|
||||||
- - keystone-mysql-router:db-router
|
|
||||||
- mysql-innodb-cluster:db-router
|
|
||||||
- - nova-mysql-router:db-router
|
|
||||||
- mysql-innodb-cluster:db-router
|
|
||||||
- - glance-mysql-router:db-router
|
|
||||||
- mysql-innodb-cluster:db-router
|
|
||||||
- - neutron-mysql-router:db-router
|
|
||||||
- mysql-innodb-cluster:db-router
|
|
||||||
- - placement-mysql-router:db-router
|
|
||||||
- mysql-innodb-cluster:db-router
|
|
||||||
|
|
||||||
- - nova-compute:amqp
|
|
||||||
- rabbitmq-server:amqp
|
|
||||||
- - 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:amqp
|
|
||||||
- rabbitmq-server:amqp
|
|
||||||
- - glance:amqp
|
|
||||||
- rabbitmq-server:amqp
|
|
||||||
- - nova-cloud-controller:image-service
|
|
||||||
- glance:image-service
|
|
||||||
- - nova-compute:image-service
|
|
||||||
- glance:image-service
|
|
||||||
- - nova-cloud-controller:cloud-compute
|
|
||||||
- nova-compute:cloud-compute
|
|
||||||
- - nova-cloud-controller:amqp
|
|
||||||
- rabbitmq-server:amqp
|
|
||||||
- - nova-compute:neutron-plugin
|
|
||||||
- neutron-openvswitch:neutron-plugin
|
|
||||||
- - neutron-openvswitch:amqp
|
|
||||||
- rabbitmq-server:amqp
|
|
||||||
- - nova-cloud-controller:neutron-api
|
|
||||||
- neutron-api:neutron-api
|
|
||||||
- - neutron-api
|
|
||||||
- neutron-api-plugin-arista
|
|
||||||
- - neutron-api:neutron-plugin-api-subordinate
|
|
||||||
- neutron-api-plugin-arista:neutron-plugin-api-subordinate
|
|
||||||
- - lldpd
|
|
||||||
- nova-compute
|
|
||||||
- - placement:identity-service
|
|
||||||
- keystone:identity-service
|
|
||||||
- - placement:placement
|
|
||||||
- nova-cloud-controller:placement
|
|
@ -1,180 +0,0 @@
|
|||||||
variables:
|
|
||||||
openstack-origin: &openstack-origin cloud:focal-wallaby
|
|
||||||
|
|
||||||
series: &series focal
|
|
||||||
|
|
||||||
applications:
|
|
||||||
|
|
||||||
keystone-mysql-router:
|
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
|
||||||
nova-mysql-router:
|
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
|
||||||
glance-mysql-router:
|
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
|
||||||
neutron-mysql-router:
|
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
|
||||||
placement-mysql-router:
|
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
|
||||||
mysql-innodb-cluster:
|
|
||||||
constraints: mem=3072M
|
|
||||||
charm: cs:~openstack-charmers/mysql-innodb-cluster
|
|
||||||
num_units: 3
|
|
||||||
options:
|
|
||||||
source: *openstack-origin
|
|
||||||
|
|
||||||
glance:
|
|
||||||
charm: cs:~openstack-charmers/glance
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
|
|
||||||
keystone:
|
|
||||||
charm: cs:~openstack-charmers/keystone
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
|
|
||||||
neutron-api:
|
|
||||||
charm: cs:~openstack-charmers/neutron-api
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
enable-ml2-dns: False
|
|
||||||
flat-network-providers: default
|
|
||||||
vlan-ranges: default:1000:3000
|
|
||||||
vni-ranges: 1001:2000
|
|
||||||
neutron-security-groups: True
|
|
||||||
overlay-network-type: vxlan
|
|
||||||
use-internal-endpoints: True
|
|
||||||
enable-l3ha: True
|
|
||||||
dhcp-agents-per-network: 2
|
|
||||||
enable-ml2-port-security: True
|
|
||||||
default-tenant-network-type: vlan
|
|
||||||
l2-population: False
|
|
||||||
ipv4-ptr-zone-prefix-size:
|
|
||||||
reverse-dns-lookup: False
|
|
||||||
dns-domain:
|
|
||||||
manage-neutron-plugin-legacy-mode: False
|
|
||||||
|
|
||||||
neutron-openvswitch:
|
|
||||||
charm: cs:~openstack-charmers/neutron-openvswitch
|
|
||||||
num_units: 0
|
|
||||||
options:
|
|
||||||
prevent-arp-spoofing: True
|
|
||||||
firewall-driver: openvswitch
|
|
||||||
enable-local-dhcp-and-metadata: True
|
|
||||||
bridge-mappings: default:br-data
|
|
||||||
data-port: ens7
|
|
||||||
|
|
||||||
nova-cloud-controller:
|
|
||||||
charm: cs:~openstack-charmers/nova-cloud-controller
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
network-manager: Neutron
|
|
||||||
|
|
||||||
neutron-api-plugin-arista:
|
|
||||||
charm: ../../../neutron-api-plugin-arista
|
|
||||||
num_units: 0
|
|
||||||
options:
|
|
||||||
source: *openstack-origin
|
|
||||||
|
|
||||||
# Fake IP, will be set to arista-virt-test-fixture's IP address on test
|
|
||||||
# setup:
|
|
||||||
eapi-host: 192.0.2.42
|
|
||||||
eapi-username: admin
|
|
||||||
eapi-password: password123
|
|
||||||
api-type: EAPI
|
|
||||||
|
|
||||||
placement:
|
|
||||||
charm: cs:~openstack-charmers/placement
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
|
|
||||||
nova-compute:
|
|
||||||
charm: cs:~openstack-charmers/nova-compute
|
|
||||||
num_units: 2
|
|
||||||
constraints: mem=4G cores=4
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
config-flags: default_ephemeral_format=ext4
|
|
||||||
enable-live-migration: true
|
|
||||||
enable-resize: true
|
|
||||||
migration-auth-type: ssh
|
|
||||||
|
|
||||||
rabbitmq-server:
|
|
||||||
charm: cs:~openstack-charmers/rabbitmq-server
|
|
||||||
num_units: 1
|
|
||||||
|
|
||||||
lldpd:
|
|
||||||
charm: cs:lldpd
|
|
||||||
options:
|
|
||||||
interfaces-regex: 'en*'
|
|
||||||
short-name: true
|
|
||||||
|
|
||||||
arista-virt-test-fixture:
|
|
||||||
charm: cs:~openstack-charmers-next/arista-virt-test-fixture
|
|
||||||
num_units: 1
|
|
||||||
constraints: mem=4G
|
|
||||||
|
|
||||||
relations:
|
|
||||||
- - keystone:shared-db
|
|
||||||
- keystone-mysql-router:shared-db
|
|
||||||
- - nova-cloud-controller:shared-db
|
|
||||||
- nova-mysql-router:shared-db
|
|
||||||
- - glance:shared-db
|
|
||||||
- glance-mysql-router:shared-db
|
|
||||||
- - neutron-api:shared-db
|
|
||||||
- neutron-mysql-router:shared-db
|
|
||||||
- - placement:shared-db
|
|
||||||
- placement-mysql-router:shared-db
|
|
||||||
- - keystone-mysql-router:db-router
|
|
||||||
- mysql-innodb-cluster:db-router
|
|
||||||
- - nova-mysql-router:db-router
|
|
||||||
- mysql-innodb-cluster:db-router
|
|
||||||
- - glance-mysql-router:db-router
|
|
||||||
- mysql-innodb-cluster:db-router
|
|
||||||
- - neutron-mysql-router:db-router
|
|
||||||
- mysql-innodb-cluster:db-router
|
|
||||||
- - placement-mysql-router:db-router
|
|
||||||
- mysql-innodb-cluster:db-router
|
|
||||||
|
|
||||||
- - nova-compute:amqp
|
|
||||||
- rabbitmq-server:amqp
|
|
||||||
- - 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:amqp
|
|
||||||
- rabbitmq-server:amqp
|
|
||||||
- - glance:amqp
|
|
||||||
- rabbitmq-server:amqp
|
|
||||||
- - nova-cloud-controller:image-service
|
|
||||||
- glance:image-service
|
|
||||||
- - nova-compute:image-service
|
|
||||||
- glance:image-service
|
|
||||||
- - nova-cloud-controller:cloud-compute
|
|
||||||
- nova-compute:cloud-compute
|
|
||||||
- - nova-cloud-controller:amqp
|
|
||||||
- rabbitmq-server:amqp
|
|
||||||
- - nova-compute:neutron-plugin
|
|
||||||
- neutron-openvswitch:neutron-plugin
|
|
||||||
- - neutron-openvswitch:amqp
|
|
||||||
- rabbitmq-server:amqp
|
|
||||||
- - nova-cloud-controller:neutron-api
|
|
||||||
- neutron-api:neutron-api
|
|
||||||
- - neutron-api
|
|
||||||
- neutron-api-plugin-arista
|
|
||||||
- - neutron-api:neutron-plugin-api-subordinate
|
|
||||||
- neutron-api-plugin-arista:neutron-plugin-api-subordinate
|
|
||||||
- - lldpd
|
|
||||||
- nova-compute
|
|
||||||
- - placement:identity-service
|
|
||||||
- keystone:identity-service
|
|
||||||
- - placement:placement
|
|
||||||
- nova-cloud-controller:placement
|
|
@ -1,180 +0,0 @@
|
|||||||
variables:
|
|
||||||
openstack-origin: &openstack-origin cloud:focal-xena
|
|
||||||
|
|
||||||
series: &series focal
|
|
||||||
|
|
||||||
applications:
|
|
||||||
|
|
||||||
keystone-mysql-router:
|
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
|
||||||
nova-mysql-router:
|
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
|
||||||
glance-mysql-router:
|
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
|
||||||
neutron-mysql-router:
|
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
|
||||||
placement-mysql-router:
|
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
|
||||||
mysql-innodb-cluster:
|
|
||||||
constraints: mem=3072M
|
|
||||||
charm: cs:~openstack-charmers/mysql-innodb-cluster
|
|
||||||
num_units: 3
|
|
||||||
options:
|
|
||||||
source: *openstack-origin
|
|
||||||
|
|
||||||
glance:
|
|
||||||
charm: cs:~openstack-charmers/glance
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
|
|
||||||
keystone:
|
|
||||||
charm: cs:~openstack-charmers/keystone
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
|
|
||||||
neutron-api:
|
|
||||||
charm: cs:~openstack-charmers/neutron-api
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
enable-ml2-dns: False
|
|
||||||
flat-network-providers: default
|
|
||||||
vlan-ranges: default:1000:3000
|
|
||||||
vni-ranges: 1001:2000
|
|
||||||
neutron-security-groups: True
|
|
||||||
overlay-network-type: vxlan
|
|
||||||
use-internal-endpoints: True
|
|
||||||
enable-l3ha: True
|
|
||||||
dhcp-agents-per-network: 2
|
|
||||||
enable-ml2-port-security: True
|
|
||||||
default-tenant-network-type: vlan
|
|
||||||
l2-population: False
|
|
||||||
ipv4-ptr-zone-prefix-size:
|
|
||||||
reverse-dns-lookup: False
|
|
||||||
dns-domain:
|
|
||||||
manage-neutron-plugin-legacy-mode: False
|
|
||||||
|
|
||||||
neutron-openvswitch:
|
|
||||||
charm: cs:~openstack-charmers/neutron-openvswitch
|
|
||||||
num_units: 0
|
|
||||||
options:
|
|
||||||
prevent-arp-spoofing: True
|
|
||||||
firewall-driver: openvswitch
|
|
||||||
enable-local-dhcp-and-metadata: True
|
|
||||||
bridge-mappings: default:br-data
|
|
||||||
data-port: ens7
|
|
||||||
|
|
||||||
nova-cloud-controller:
|
|
||||||
charm: cs:~openstack-charmers/nova-cloud-controller
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
network-manager: Neutron
|
|
||||||
|
|
||||||
neutron-api-plugin-arista:
|
|
||||||
charm: ../../../neutron-api-plugin-arista
|
|
||||||
num_units: 0
|
|
||||||
options:
|
|
||||||
source: *openstack-origin
|
|
||||||
|
|
||||||
# Fake IP, will be set to arista-virt-test-fixture's IP address on test
|
|
||||||
# setup:
|
|
||||||
eapi-host: 192.0.2.42
|
|
||||||
eapi-username: admin
|
|
||||||
eapi-password: password123
|
|
||||||
api-type: EAPI
|
|
||||||
|
|
||||||
placement:
|
|
||||||
charm: cs:~openstack-charmers/placement
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
|
|
||||||
nova-compute:
|
|
||||||
charm: cs:~openstack-charmers/nova-compute
|
|
||||||
num_units: 2
|
|
||||||
constraints: mem=4G cores=4
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
config-flags: default_ephemeral_format=ext4
|
|
||||||
enable-live-migration: true
|
|
||||||
enable-resize: true
|
|
||||||
migration-auth-type: ssh
|
|
||||||
|
|
||||||
rabbitmq-server:
|
|
||||||
charm: cs:~openstack-charmers/rabbitmq-server
|
|
||||||
num_units: 1
|
|
||||||
|
|
||||||
lldpd:
|
|
||||||
charm: cs:lldpd
|
|
||||||
options:
|
|
||||||
interfaces-regex: 'en*'
|
|
||||||
short-name: true
|
|
||||||
|
|
||||||
arista-virt-test-fixture:
|
|
||||||
charm: cs:~openstack-charmers-next/arista-virt-test-fixture
|
|
||||||
num_units: 1
|
|
||||||
constraints: mem=4G
|
|
||||||
|
|
||||||
relations:
|
|
||||||
- - keystone:shared-db
|
|
||||||
- keystone-mysql-router:shared-db
|
|
||||||
- - nova-cloud-controller:shared-db
|
|
||||||
- nova-mysql-router:shared-db
|
|
||||||
- - glance:shared-db
|
|
||||||
- glance-mysql-router:shared-db
|
|
||||||
- - neutron-api:shared-db
|
|
||||||
- neutron-mysql-router:shared-db
|
|
||||||
- - placement:shared-db
|
|
||||||
- placement-mysql-router:shared-db
|
|
||||||
- - keystone-mysql-router:db-router
|
|
||||||
- mysql-innodb-cluster:db-router
|
|
||||||
- - nova-mysql-router:db-router
|
|
||||||
- mysql-innodb-cluster:db-router
|
|
||||||
- - glance-mysql-router:db-router
|
|
||||||
- mysql-innodb-cluster:db-router
|
|
||||||
- - neutron-mysql-router:db-router
|
|
||||||
- mysql-innodb-cluster:db-router
|
|
||||||
- - placement-mysql-router:db-router
|
|
||||||
- mysql-innodb-cluster:db-router
|
|
||||||
|
|
||||||
- - nova-compute:amqp
|
|
||||||
- rabbitmq-server:amqp
|
|
||||||
- - 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:amqp
|
|
||||||
- rabbitmq-server:amqp
|
|
||||||
- - glance:amqp
|
|
||||||
- rabbitmq-server:amqp
|
|
||||||
- - nova-cloud-controller:image-service
|
|
||||||
- glance:image-service
|
|
||||||
- - nova-compute:image-service
|
|
||||||
- glance:image-service
|
|
||||||
- - nova-cloud-controller:cloud-compute
|
|
||||||
- nova-compute:cloud-compute
|
|
||||||
- - nova-cloud-controller:amqp
|
|
||||||
- rabbitmq-server:amqp
|
|
||||||
- - nova-compute:neutron-plugin
|
|
||||||
- neutron-openvswitch:neutron-plugin
|
|
||||||
- - neutron-openvswitch:amqp
|
|
||||||
- rabbitmq-server:amqp
|
|
||||||
- - nova-cloud-controller:neutron-api
|
|
||||||
- neutron-api:neutron-api
|
|
||||||
- - neutron-api
|
|
||||||
- neutron-api-plugin-arista
|
|
||||||
- - neutron-api:neutron-plugin-api-subordinate
|
|
||||||
- neutron-api-plugin-arista:neutron-plugin-api-subordinate
|
|
||||||
- - lldpd
|
|
||||||
- nova-compute
|
|
||||||
- - placement:identity-service
|
|
||||||
- keystone:identity-service
|
|
||||||
- - placement:placement
|
|
||||||
- nova-cloud-controller:placement
|
|
@ -1,180 +0,0 @@
|
|||||||
variables:
|
|
||||||
openstack-origin: &openstack-origin distro
|
|
||||||
|
|
||||||
series: &series groovy
|
|
||||||
|
|
||||||
applications:
|
|
||||||
|
|
||||||
keystone-mysql-router:
|
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
|
||||||
nova-mysql-router:
|
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
|
||||||
glance-mysql-router:
|
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
|
||||||
neutron-mysql-router:
|
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
|
||||||
placement-mysql-router:
|
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
|
||||||
mysql-innodb-cluster:
|
|
||||||
constraints: mem=3072M
|
|
||||||
charm: cs:~openstack-charmers/mysql-innodb-cluster
|
|
||||||
num_units: 3
|
|
||||||
options:
|
|
||||||
source: *openstack-origin
|
|
||||||
|
|
||||||
glance:
|
|
||||||
charm: cs:~openstack-charmers/glance
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
|
|
||||||
keystone:
|
|
||||||
charm: cs:~openstack-charmers/keystone
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
|
|
||||||
neutron-api:
|
|
||||||
charm: cs:~openstack-charmers/neutron-api
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
enable-ml2-dns: False
|
|
||||||
flat-network-providers: default
|
|
||||||
vlan-ranges: default:1000:3000
|
|
||||||
vni-ranges: 1001:2000
|
|
||||||
neutron-security-groups: True
|
|
||||||
overlay-network-type: vxlan
|
|
||||||
use-internal-endpoints: True
|
|
||||||
enable-l3ha: True
|
|
||||||
dhcp-agents-per-network: 2
|
|
||||||
enable-ml2-port-security: True
|
|
||||||
default-tenant-network-type: vlan
|
|
||||||
l2-population: False
|
|
||||||
ipv4-ptr-zone-prefix-size:
|
|
||||||
reverse-dns-lookup: False
|
|
||||||
dns-domain:
|
|
||||||
manage-neutron-plugin-legacy-mode: False
|
|
||||||
|
|
||||||
neutron-openvswitch:
|
|
||||||
charm: cs:~openstack-charmers/neutron-openvswitch
|
|
||||||
num_units: 0
|
|
||||||
options:
|
|
||||||
prevent-arp-spoofing: True
|
|
||||||
firewall-driver: openvswitch
|
|
||||||
enable-local-dhcp-and-metadata: True
|
|
||||||
bridge-mappings: default:br-data
|
|
||||||
data-port: ens7
|
|
||||||
|
|
||||||
nova-cloud-controller:
|
|
||||||
charm: cs:~openstack-charmers/nova-cloud-controller
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
network-manager: Neutron
|
|
||||||
|
|
||||||
neutron-api-plugin-arista:
|
|
||||||
charm: ../../../neutron-api-plugin-arista
|
|
||||||
num_units: 0
|
|
||||||
options:
|
|
||||||
source: *openstack-origin
|
|
||||||
|
|
||||||
# Fake IP, will be set to arista-virt-test-fixture's IP address on test
|
|
||||||
# setup:
|
|
||||||
eapi-host: 192.0.2.42
|
|
||||||
eapi-username: admin
|
|
||||||
eapi-password: password123
|
|
||||||
api-type: EAPI
|
|
||||||
|
|
||||||
placement:
|
|
||||||
charm: cs:~openstack-charmers/placement
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
|
|
||||||
nova-compute:
|
|
||||||
charm: cs:~openstack-charmers/nova-compute
|
|
||||||
num_units: 2
|
|
||||||
constraints: mem=4G cores=4
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
config-flags: default_ephemeral_format=ext4
|
|
||||||
enable-live-migration: true
|
|
||||||
enable-resize: true
|
|
||||||
migration-auth-type: ssh
|
|
||||||
|
|
||||||
rabbitmq-server:
|
|
||||||
charm: cs:~openstack-charmers/rabbitmq-server
|
|
||||||
num_units: 1
|
|
||||||
|
|
||||||
lldpd:
|
|
||||||
charm: cs:lldpd
|
|
||||||
options:
|
|
||||||
interfaces-regex: 'en*'
|
|
||||||
short-name: true
|
|
||||||
|
|
||||||
arista-virt-test-fixture:
|
|
||||||
charm: cs:~openstack-charmers-next/arista-virt-test-fixture
|
|
||||||
num_units: 1
|
|
||||||
constraints: mem=4G
|
|
||||||
|
|
||||||
relations:
|
|
||||||
- - keystone:shared-db
|
|
||||||
- keystone-mysql-router:shared-db
|
|
||||||
- - nova-cloud-controller:shared-db
|
|
||||||
- nova-mysql-router:shared-db
|
|
||||||
- - glance:shared-db
|
|
||||||
- glance-mysql-router:shared-db
|
|
||||||
- - neutron-api:shared-db
|
|
||||||
- neutron-mysql-router:shared-db
|
|
||||||
- - placement:shared-db
|
|
||||||
- placement-mysql-router:shared-db
|
|
||||||
- - keystone-mysql-router:db-router
|
|
||||||
- mysql-innodb-cluster:db-router
|
|
||||||
- - nova-mysql-router:db-router
|
|
||||||
- mysql-innodb-cluster:db-router
|
|
||||||
- - glance-mysql-router:db-router
|
|
||||||
- mysql-innodb-cluster:db-router
|
|
||||||
- - neutron-mysql-router:db-router
|
|
||||||
- mysql-innodb-cluster:db-router
|
|
||||||
- - placement-mysql-router:db-router
|
|
||||||
- mysql-innodb-cluster:db-router
|
|
||||||
|
|
||||||
- - nova-compute:amqp
|
|
||||||
- rabbitmq-server:amqp
|
|
||||||
- - 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:amqp
|
|
||||||
- rabbitmq-server:amqp
|
|
||||||
- - glance:amqp
|
|
||||||
- rabbitmq-server:amqp
|
|
||||||
- - nova-cloud-controller:image-service
|
|
||||||
- glance:image-service
|
|
||||||
- - nova-compute:image-service
|
|
||||||
- glance:image-service
|
|
||||||
- - nova-cloud-controller:cloud-compute
|
|
||||||
- nova-compute:cloud-compute
|
|
||||||
- - nova-cloud-controller:amqp
|
|
||||||
- rabbitmq-server:amqp
|
|
||||||
- - nova-compute:neutron-plugin
|
|
||||||
- neutron-openvswitch:neutron-plugin
|
|
||||||
- - neutron-openvswitch:amqp
|
|
||||||
- rabbitmq-server:amqp
|
|
||||||
- - nova-cloud-controller:neutron-api
|
|
||||||
- neutron-api:neutron-api
|
|
||||||
- - neutron-api
|
|
||||||
- neutron-api-plugin-arista
|
|
||||||
- - neutron-api:neutron-plugin-api-subordinate
|
|
||||||
- neutron-api-plugin-arista:neutron-plugin-api-subordinate
|
|
||||||
- - lldpd
|
|
||||||
- nova-compute
|
|
||||||
- - placement:identity-service
|
|
||||||
- keystone:identity-service
|
|
||||||
- - placement:placement
|
|
||||||
- nova-cloud-controller:placement
|
|
@ -1,184 +0,0 @@
|
|||||||
variables:
|
|
||||||
openstack-origin: &openstack-origin distro
|
|
||||||
|
|
||||||
series: &series hirsute
|
|
||||||
|
|
||||||
applications:
|
|
||||||
|
|
||||||
keystone-mysql-router:
|
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
|
||||||
nova-mysql-router:
|
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
|
||||||
glance-mysql-router:
|
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
|
||||||
neutron-mysql-router:
|
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
|
||||||
placement-mysql-router:
|
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
|
||||||
mysql-innodb-cluster:
|
|
||||||
constraints: mem=3072M
|
|
||||||
charm: cs:~openstack-charmers/mysql-innodb-cluster
|
|
||||||
num_units: 3
|
|
||||||
options:
|
|
||||||
source: *openstack-origin
|
|
||||||
|
|
||||||
glance:
|
|
||||||
charm: cs:~openstack-charmers/glance
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
|
|
||||||
keystone:
|
|
||||||
charm: cs:~openstack-charmers/keystone
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
|
|
||||||
neutron-api:
|
|
||||||
charm: cs:~openstack-charmers/neutron-api
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
enable-ml2-dns: False
|
|
||||||
flat-network-providers: default
|
|
||||||
vlan-ranges: default:1000:3000
|
|
||||||
vni-ranges: 1001:2000
|
|
||||||
neutron-security-groups: True
|
|
||||||
overlay-network-type: vxlan
|
|
||||||
use-internal-endpoints: True
|
|
||||||
enable-l3ha: True
|
|
||||||
dhcp-agents-per-network: 2
|
|
||||||
enable-ml2-port-security: True
|
|
||||||
default-tenant-network-type: vlan
|
|
||||||
l2-population: False
|
|
||||||
ipv4-ptr-zone-prefix-size:
|
|
||||||
reverse-dns-lookup: False
|
|
||||||
dns-domain:
|
|
||||||
manage-neutron-plugin-legacy-mode: False
|
|
||||||
|
|
||||||
neutron-openvswitch:
|
|
||||||
charm: cs:~openstack-charmers/neutron-openvswitch
|
|
||||||
num_units: 0
|
|
||||||
options:
|
|
||||||
prevent-arp-spoofing: True
|
|
||||||
firewall-driver: openvswitch
|
|
||||||
enable-local-dhcp-and-metadata: True
|
|
||||||
bridge-mappings: default:br-data
|
|
||||||
data-port: ens7
|
|
||||||
|
|
||||||
nova-cloud-controller:
|
|
||||||
charm: cs:~openstack-charmers/nova-cloud-controller
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
network-manager: Neutron
|
|
||||||
|
|
||||||
neutron-api-plugin-arista:
|
|
||||||
charm: ../../../neutron-api-plugin-arista
|
|
||||||
num_units: 0
|
|
||||||
options:
|
|
||||||
source: *openstack-origin
|
|
||||||
|
|
||||||
# Fake IP, will be set to arista-virt-test-fixture's IP address on test
|
|
||||||
# setup:
|
|
||||||
eapi-host: 192.0.2.42
|
|
||||||
eapi-username: admin
|
|
||||||
eapi-password: password123
|
|
||||||
api-type: EAPI
|
|
||||||
|
|
||||||
placement:
|
|
||||||
charm: cs:~openstack-charmers/placement
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
|
|
||||||
nova-compute:
|
|
||||||
charm: cs:~openstack-charmers/nova-compute
|
|
||||||
num_units: 2
|
|
||||||
constraints: mem=4G cores=4
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
config-flags: default_ephemeral_format=ext4
|
|
||||||
enable-live-migration: true
|
|
||||||
enable-resize: true
|
|
||||||
migration-auth-type: ssh
|
|
||||||
|
|
||||||
rabbitmq-server:
|
|
||||||
charm: cs:~openstack-charmers/rabbitmq-server
|
|
||||||
num_units: 1
|
|
||||||
|
|
||||||
lldpd:
|
|
||||||
charm: cs:lldpd
|
|
||||||
options:
|
|
||||||
interfaces-regex: 'en*'
|
|
||||||
short-name: true
|
|
||||||
|
|
||||||
arista-virt-test-fixture:
|
|
||||||
# NOTE(lourot): workaround - this charm doesn't work on hirsute+ yet
|
|
||||||
# see https://github.com/openstack-charmers/charm-arista-virt-test-fixture/issues/11
|
|
||||||
series: groovy
|
|
||||||
|
|
||||||
charm: cs:~openstack-charmers-next/arista-virt-test-fixture
|
|
||||||
num_units: 1
|
|
||||||
constraints: mem=4G
|
|
||||||
|
|
||||||
relations:
|
|
||||||
- - keystone:shared-db
|
|
||||||
- keystone-mysql-router:shared-db
|
|
||||||
- - nova-cloud-controller:shared-db
|
|
||||||
- nova-mysql-router:shared-db
|
|
||||||
- - glance:shared-db
|
|
||||||
- glance-mysql-router:shared-db
|
|
||||||
- - neutron-api:shared-db
|
|
||||||
- neutron-mysql-router:shared-db
|
|
||||||
- - placement:shared-db
|
|
||||||
- placement-mysql-router:shared-db
|
|
||||||
- - keystone-mysql-router:db-router
|
|
||||||
- mysql-innodb-cluster:db-router
|
|
||||||
- - nova-mysql-router:db-router
|
|
||||||
- mysql-innodb-cluster:db-router
|
|
||||||
- - glance-mysql-router:db-router
|
|
||||||
- mysql-innodb-cluster:db-router
|
|
||||||
- - neutron-mysql-router:db-router
|
|
||||||
- mysql-innodb-cluster:db-router
|
|
||||||
- - placement-mysql-router:db-router
|
|
||||||
- mysql-innodb-cluster:db-router
|
|
||||||
|
|
||||||
- - nova-compute:amqp
|
|
||||||
- rabbitmq-server:amqp
|
|
||||||
- - 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:amqp
|
|
||||||
- rabbitmq-server:amqp
|
|
||||||
- - glance:amqp
|
|
||||||
- rabbitmq-server:amqp
|
|
||||||
- - nova-cloud-controller:image-service
|
|
||||||
- glance:image-service
|
|
||||||
- - nova-compute:image-service
|
|
||||||
- glance:image-service
|
|
||||||
- - nova-cloud-controller:cloud-compute
|
|
||||||
- nova-compute:cloud-compute
|
|
||||||
- - nova-cloud-controller:amqp
|
|
||||||
- rabbitmq-server:amqp
|
|
||||||
- - nova-compute:neutron-plugin
|
|
||||||
- neutron-openvswitch:neutron-plugin
|
|
||||||
- - neutron-openvswitch:amqp
|
|
||||||
- rabbitmq-server:amqp
|
|
||||||
- - nova-cloud-controller:neutron-api
|
|
||||||
- neutron-api:neutron-api
|
|
||||||
- - neutron-api
|
|
||||||
- neutron-api-plugin-arista
|
|
||||||
- - neutron-api:neutron-plugin-api-subordinate
|
|
||||||
- neutron-api-plugin-arista:neutron-plugin-api-subordinate
|
|
||||||
- - lldpd
|
|
||||||
- nova-compute
|
|
||||||
- - placement:identity-service
|
|
||||||
- keystone:identity-service
|
|
||||||
- - placement:placement
|
|
||||||
- nova-cloud-controller:placement
|
|
@ -1,184 +0,0 @@
|
|||||||
variables:
|
|
||||||
openstack-origin: &openstack-origin distro
|
|
||||||
|
|
||||||
series: &series impish
|
|
||||||
|
|
||||||
applications:
|
|
||||||
|
|
||||||
keystone-mysql-router:
|
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
|
||||||
nova-mysql-router:
|
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
|
||||||
glance-mysql-router:
|
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
|
||||||
neutron-mysql-router:
|
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
|
||||||
placement-mysql-router:
|
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
|
||||||
mysql-innodb-cluster:
|
|
||||||
constraints: mem=3072M
|
|
||||||
charm: cs:~openstack-charmers/mysql-innodb-cluster
|
|
||||||
num_units: 3
|
|
||||||
options:
|
|
||||||
source: *openstack-origin
|
|
||||||
|
|
||||||
glance:
|
|
||||||
charm: cs:~openstack-charmers/glance
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
|
|
||||||
keystone:
|
|
||||||
charm: cs:~openstack-charmers/keystone
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
|
|
||||||
neutron-api:
|
|
||||||
charm: cs:~openstack-charmers/neutron-api
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
enable-ml2-dns: False
|
|
||||||
flat-network-providers: default
|
|
||||||
vlan-ranges: default:1000:3000
|
|
||||||
vni-ranges: 1001:2000
|
|
||||||
neutron-security-groups: True
|
|
||||||
overlay-network-type: vxlan
|
|
||||||
use-internal-endpoints: True
|
|
||||||
enable-l3ha: True
|
|
||||||
dhcp-agents-per-network: 2
|
|
||||||
enable-ml2-port-security: True
|
|
||||||
default-tenant-network-type: vlan
|
|
||||||
l2-population: False
|
|
||||||
ipv4-ptr-zone-prefix-size:
|
|
||||||
reverse-dns-lookup: False
|
|
||||||
dns-domain:
|
|
||||||
manage-neutron-plugin-legacy-mode: False
|
|
||||||
|
|
||||||
neutron-openvswitch:
|
|
||||||
charm: cs:~openstack-charmers/neutron-openvswitch
|
|
||||||
num_units: 0
|
|
||||||
options:
|
|
||||||
prevent-arp-spoofing: True
|
|
||||||
firewall-driver: openvswitch
|
|
||||||
enable-local-dhcp-and-metadata: True
|
|
||||||
bridge-mappings: default:br-data
|
|
||||||
data-port: ens7
|
|
||||||
|
|
||||||
nova-cloud-controller:
|
|
||||||
charm: cs:~openstack-charmers/nova-cloud-controller
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
network-manager: Neutron
|
|
||||||
|
|
||||||
neutron-api-plugin-arista:
|
|
||||||
charm: ../../../neutron-api-plugin-arista
|
|
||||||
num_units: 0
|
|
||||||
options:
|
|
||||||
source: *openstack-origin
|
|
||||||
|
|
||||||
# Fake IP, will be set to arista-virt-test-fixture's IP address on test
|
|
||||||
# setup:
|
|
||||||
eapi-host: 192.0.2.42
|
|
||||||
eapi-username: admin
|
|
||||||
eapi-password: password123
|
|
||||||
api-type: EAPI
|
|
||||||
|
|
||||||
placement:
|
|
||||||
charm: cs:~openstack-charmers/placement
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
|
|
||||||
nova-compute:
|
|
||||||
charm: cs:~openstack-charmers/nova-compute
|
|
||||||
num_units: 2
|
|
||||||
constraints: mem=4G cores=4
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
config-flags: default_ephemeral_format=ext4
|
|
||||||
enable-live-migration: true
|
|
||||||
enable-resize: true
|
|
||||||
migration-auth-type: ssh
|
|
||||||
|
|
||||||
rabbitmq-server:
|
|
||||||
charm: cs:~openstack-charmers/rabbitmq-server
|
|
||||||
num_units: 1
|
|
||||||
|
|
||||||
lldpd:
|
|
||||||
charm: cs:lldpd
|
|
||||||
options:
|
|
||||||
interfaces-regex: 'en*'
|
|
||||||
short-name: true
|
|
||||||
|
|
||||||
arista-virt-test-fixture:
|
|
||||||
# NOTE(lourot): workaround - this charm doesn't work on hirsute+ yet
|
|
||||||
# see https://github.com/openstack-charmers/charm-arista-virt-test-fixture/issues/11
|
|
||||||
series: groovy
|
|
||||||
|
|
||||||
charm: cs:~openstack-charmers-next/arista-virt-test-fixture
|
|
||||||
num_units: 1
|
|
||||||
constraints: mem=4G
|
|
||||||
|
|
||||||
relations:
|
|
||||||
- - keystone:shared-db
|
|
||||||
- keystone-mysql-router:shared-db
|
|
||||||
- - nova-cloud-controller:shared-db
|
|
||||||
- nova-mysql-router:shared-db
|
|
||||||
- - glance:shared-db
|
|
||||||
- glance-mysql-router:shared-db
|
|
||||||
- - neutron-api:shared-db
|
|
||||||
- neutron-mysql-router:shared-db
|
|
||||||
- - placement:shared-db
|
|
||||||
- placement-mysql-router:shared-db
|
|
||||||
- - keystone-mysql-router:db-router
|
|
||||||
- mysql-innodb-cluster:db-router
|
|
||||||
- - nova-mysql-router:db-router
|
|
||||||
- mysql-innodb-cluster:db-router
|
|
||||||
- - glance-mysql-router:db-router
|
|
||||||
- mysql-innodb-cluster:db-router
|
|
||||||
- - neutron-mysql-router:db-router
|
|
||||||
- mysql-innodb-cluster:db-router
|
|
||||||
- - placement-mysql-router:db-router
|
|
||||||
- mysql-innodb-cluster:db-router
|
|
||||||
|
|
||||||
- - nova-compute:amqp
|
|
||||||
- rabbitmq-server:amqp
|
|
||||||
- - 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:amqp
|
|
||||||
- rabbitmq-server:amqp
|
|
||||||
- - glance:amqp
|
|
||||||
- rabbitmq-server:amqp
|
|
||||||
- - nova-cloud-controller:image-service
|
|
||||||
- glance:image-service
|
|
||||||
- - nova-compute:image-service
|
|
||||||
- glance:image-service
|
|
||||||
- - nova-cloud-controller:cloud-compute
|
|
||||||
- nova-compute:cloud-compute
|
|
||||||
- - nova-cloud-controller:amqp
|
|
||||||
- rabbitmq-server:amqp
|
|
||||||
- - nova-compute:neutron-plugin
|
|
||||||
- neutron-openvswitch:neutron-plugin
|
|
||||||
- - neutron-openvswitch:amqp
|
|
||||||
- rabbitmq-server:amqp
|
|
||||||
- - nova-cloud-controller:neutron-api
|
|
||||||
- neutron-api:neutron-api
|
|
||||||
- - neutron-api
|
|
||||||
- neutron-api-plugin-arista
|
|
||||||
- - neutron-api:neutron-plugin-api-subordinate
|
|
||||||
- neutron-api-plugin-arista:neutron-plugin-api-subordinate
|
|
||||||
- - lldpd
|
|
||||||
- nova-compute
|
|
||||||
- - placement:identity-service
|
|
||||||
- keystone:identity-service
|
|
||||||
- - placement:placement
|
|
||||||
- nova-cloud-controller:placement
|
|
@ -1,4 +0,0 @@
|
|||||||
applications:
|
|
||||||
arista-virt-test-fixture:
|
|
||||||
resources:
|
|
||||||
arista-image: '{{ TEST_ARISTA_IMAGE_LOCAL }}'
|
|
@ -1,4 +0,0 @@
|
|||||||
applications:
|
|
||||||
arista-virt-test-fixture:
|
|
||||||
resources:
|
|
||||||
arista-image: '{{ TEST_ARISTA_IMAGE_LOCAL }}'
|
|
@ -1,4 +0,0 @@
|
|||||||
applications:
|
|
||||||
arista-virt-test-fixture:
|
|
||||||
resources:
|
|
||||||
arista-image: '{{ TEST_ARISTA_IMAGE_LOCAL }}'
|
|
@ -1,4 +0,0 @@
|
|||||||
applications:
|
|
||||||
arista-virt-test-fixture:
|
|
||||||
resources:
|
|
||||||
arista-image: '{{ TEST_ARISTA_IMAGE_LOCAL }}'
|
|
1
src/tests/bundles/overlays/bionic-train.yaml.j2
Symbolic link
1
src/tests/bundles/overlays/bionic-train.yaml.j2
Symbolic link
@ -0,0 +1 @@
|
|||||||
|
arista-virt-test-fixture-image.yaml.j2
|
@ -1,4 +0,0 @@
|
|||||||
applications:
|
|
||||||
arista-virt-test-fixture:
|
|
||||||
resources:
|
|
||||||
arista-image: '{{ TEST_ARISTA_IMAGE_LOCAL }}'
|
|
1
src/tests/bundles/overlays/bionic-ussuri.yaml.j2
Symbolic link
1
src/tests/bundles/overlays/bionic-ussuri.yaml.j2
Symbolic link
@ -0,0 +1 @@
|
|||||||
|
arista-virt-test-fixture-image.yaml.j2
|
@ -1,4 +0,0 @@
|
|||||||
applications:
|
|
||||||
arista-virt-test-fixture:
|
|
||||||
resources:
|
|
||||||
arista-image: '{{ TEST_ARISTA_IMAGE_LOCAL }}'
|
|
1
src/tests/bundles/overlays/focal-ussuri.yaml.j2
Symbolic link
1
src/tests/bundles/overlays/focal-ussuri.yaml.j2
Symbolic link
@ -0,0 +1 @@
|
|||||||
|
arista-virt-test-fixture-image.yaml.j2
|
@ -1,4 +0,0 @@
|
|||||||
applications:
|
|
||||||
arista-virt-test-fixture:
|
|
||||||
resources:
|
|
||||||
arista-image: '{{ TEST_ARISTA_IMAGE_LOCAL }}'
|
|
@ -1,4 +0,0 @@
|
|||||||
applications:
|
|
||||||
arista-virt-test-fixture:
|
|
||||||
resources:
|
|
||||||
arista-image: '{{ TEST_ARISTA_IMAGE_LOCAL }}'
|
|
@ -1,4 +0,0 @@
|
|||||||
applications:
|
|
||||||
arista-virt-test-fixture:
|
|
||||||
resources:
|
|
||||||
arista-image: '{{ TEST_ARISTA_IMAGE_LOCAL }}'
|
|
@ -1,4 +0,0 @@
|
|||||||
applications:
|
|
||||||
arista-virt-test-fixture:
|
|
||||||
resources:
|
|
||||||
arista-image: '{{ TEST_ARISTA_IMAGE_LOCAL }}'
|
|
@ -1,4 +0,0 @@
|
|||||||
applications:
|
|
||||||
arista-virt-test-fixture:
|
|
||||||
resources:
|
|
||||||
arista-image: '{{ TEST_ARISTA_IMAGE_LOCAL }}'
|
|
@ -1,4 +0,0 @@
|
|||||||
applications:
|
|
||||||
arista-virt-test-fixture:
|
|
||||||
resources:
|
|
||||||
arista-image: '{{ TEST_ARISTA_IMAGE_LOCAL }}'
|
|
@ -1,4 +0,0 @@
|
|||||||
applications:
|
|
||||||
arista-virt-test-fixture:
|
|
||||||
resources:
|
|
||||||
arista-image: '{{ TEST_ARISTA_IMAGE_LOCAL }}'
|
|
@ -1,142 +0,0 @@
|
|||||||
variables:
|
|
||||||
openstack-origin: &openstack-origin cloud:xenial-queens
|
|
||||||
|
|
||||||
series: &series xenial
|
|
||||||
|
|
||||||
applications:
|
|
||||||
|
|
||||||
glance:
|
|
||||||
charm: cs:~openstack-charmers/glance
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
|
|
||||||
keystone:
|
|
||||||
charm: cs:~openstack-charmers/keystone
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
|
|
||||||
mysql:
|
|
||||||
charm: cs:~openstack-charmers/percona-cluster
|
|
||||||
num_units: 1
|
|
||||||
|
|
||||||
neutron-api:
|
|
||||||
charm: cs:~openstack-charmers/neutron-api
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
enable-ml2-dns: False
|
|
||||||
flat-network-providers: default
|
|
||||||
vlan-ranges: default:1000:3000
|
|
||||||
vni-ranges: 1001:2000
|
|
||||||
neutron-security-groups: True
|
|
||||||
overlay-network-type: vxlan
|
|
||||||
use-internal-endpoints: True
|
|
||||||
enable-l3ha: True
|
|
||||||
dhcp-agents-per-network: 2
|
|
||||||
enable-ml2-port-security: True
|
|
||||||
default-tenant-network-type: vlan
|
|
||||||
l2-population: False
|
|
||||||
ipv4-ptr-zone-prefix-size:
|
|
||||||
reverse-dns-lookup: False
|
|
||||||
dns-domain:
|
|
||||||
manage-neutron-plugin-legacy-mode: False
|
|
||||||
|
|
||||||
neutron-openvswitch:
|
|
||||||
charm: cs:~openstack-charmers/neutron-openvswitch
|
|
||||||
num_units: 0
|
|
||||||
options:
|
|
||||||
prevent-arp-spoofing: True
|
|
||||||
firewall-driver: openvswitch
|
|
||||||
enable-local-dhcp-and-metadata: True
|
|
||||||
bridge-mappings: default:br-data
|
|
||||||
data-port: ens7
|
|
||||||
|
|
||||||
nova-cloud-controller:
|
|
||||||
charm: cs:~openstack-charmers/nova-cloud-controller
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
network-manager: Neutron
|
|
||||||
|
|
||||||
neutron-api-plugin-arista:
|
|
||||||
charm: ../../../neutron-api-plugin-arista
|
|
||||||
num_units: 0
|
|
||||||
options:
|
|
||||||
# Fake IP, will be set to arista-virt-test-fixture's IP address on test
|
|
||||||
# setup:
|
|
||||||
eapi-host: 192.0.2.42
|
|
||||||
eapi-username: admin
|
|
||||||
eapi-password: password123
|
|
||||||
api-type: EAPI
|
|
||||||
|
|
||||||
nova-compute:
|
|
||||||
charm: cs:~openstack-charmers/nova-compute
|
|
||||||
num_units: 2
|
|
||||||
constraints: mem=4G cores=4
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
config-flags: default_ephemeral_format=ext4
|
|
||||||
enable-live-migration: true
|
|
||||||
enable-resize: true
|
|
||||||
migration-auth-type: ssh
|
|
||||||
|
|
||||||
rabbitmq-server:
|
|
||||||
charm: cs:~openstack-charmers/rabbitmq-server
|
|
||||||
num_units: 1
|
|
||||||
|
|
||||||
lldpd:
|
|
||||||
charm: cs:lldpd
|
|
||||||
options:
|
|
||||||
interfaces-regex: 'en*'
|
|
||||||
short-name: true
|
|
||||||
|
|
||||||
arista-virt-test-fixture:
|
|
||||||
charm: cs:~openstack-charmers-next/arista-virt-test-fixture
|
|
||||||
num_units: 1
|
|
||||||
constraints: mem=4G
|
|
||||||
|
|
||||||
relations:
|
|
||||||
- - nova-compute:amqp
|
|
||||||
- rabbitmq-server: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:amqp
|
|
||||||
- - glance:shared-db
|
|
||||||
- mysql:shared-db
|
|
||||||
- - glance:amqp
|
|
||||||
- rabbitmq-server:amqp
|
|
||||||
- - nova-cloud-controller:image-service
|
|
||||||
- glance:image-service
|
|
||||||
- - nova-compute:image-service
|
|
||||||
- glance:image-service
|
|
||||||
- - nova-cloud-controller:cloud-compute
|
|
||||||
- nova-compute:cloud-compute
|
|
||||||
- - nova-cloud-controller:amqp
|
|
||||||
- rabbitmq-server:amqp
|
|
||||||
- - nova-compute:neutron-plugin
|
|
||||||
- neutron-openvswitch:neutron-plugin
|
|
||||||
- - neutron-openvswitch:amqp
|
|
||||||
- rabbitmq-server:amqp
|
|
||||||
- - nova-cloud-controller:shared-db
|
|
||||||
- mysql:shared-db
|
|
||||||
- - nova-cloud-controller:neutron-api
|
|
||||||
- neutron-api:neutron-api
|
|
||||||
- - neutron-api
|
|
||||||
- neutron-api-plugin-arista
|
|
||||||
- - neutron-api:neutron-plugin-api-subordinate
|
|
||||||
- neutron-api-plugin-arista:neutron-plugin-api-subordinate
|
|
||||||
- - lldpd
|
|
||||||
- nova-compute
|
|
@ -1,24 +1,14 @@
|
|||||||
charm_name: neutron-api-plugin-arista
|
charm_name: neutron-api-plugin-arista
|
||||||
|
|
||||||
smoke_bundles:
|
smoke_bundles:
|
||||||
- bionic-train
|
- focal-ussuri
|
||||||
|
|
||||||
gate_bundles:
|
gate_bundles:
|
||||||
- bionic-queens
|
|
||||||
- bionic-stein
|
|
||||||
- bionic-train
|
- bionic-train
|
||||||
- bionic-ussuri
|
- bionic-ussuri
|
||||||
- focal-ussuri
|
- focal-ussuri
|
||||||
- focal-victoria
|
|
||||||
- focal-wallaby
|
|
||||||
- hirsute-wallaby
|
|
||||||
|
|
||||||
dev_bundles:
|
dev_bundles: []
|
||||||
- xenial-queens
|
|
||||||
- bionic-rocky
|
|
||||||
- focal-xena
|
|
||||||
- groovy-victoria
|
|
||||||
- impish-xena
|
|
||||||
|
|
||||||
before_deploy:
|
before_deploy:
|
||||||
- zaza.openstack.charm_tests.neutron_arista.setup.download_arista_image
|
- zaza.openstack.charm_tests.neutron_arista.setup.download_arista_image
|
||||||
@ -30,6 +20,4 @@ tests:
|
|||||||
- zaza.openstack.charm_tests.neutron_arista.tests.NeutronCreateAristaNetworkTest
|
- zaza.openstack.charm_tests.neutron_arista.tests.NeutronCreateAristaNetworkTest
|
||||||
|
|
||||||
tests_options:
|
tests_options:
|
||||||
force_deploy:
|
force_deploy: []
|
||||||
- groovy-victoria
|
|
||||||
- impish-xena
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
|
|
||||||
git+https://github.com/openstack/charms.openstack.git@stable/21.10#egg=charms.openstack
|
git+https://github.com/openstack/charms.openstack.git@stable/ussuri#egg=charms.openstack
|
||||||
|
|
||||||
git+https://github.com/juju/charm-helpers.git@stable/21.10#egg=charmhelpers
|
git+https://github.com/juju/charm-helpers@stable/ussuri#egg=charmhelpers
|
||||||
|
@ -3,6 +3,7 @@
|
|||||||
# choices of *requirements.txt files for OpenStack Charms:
|
# choices of *requirements.txt files for OpenStack Charms:
|
||||||
# https://github.com/openstack-charmers/release-tools
|
# https://github.com/openstack-charmers/release-tools
|
||||||
#
|
#
|
||||||
|
pyparsing<3.0.0 # cffi needs pyparsing < 3.0.0.
|
||||||
cffi==1.14.6; python_version < '3.6' # cffi 1.15.0 drops support for py35.
|
cffi==1.14.6; python_version < '3.6' # cffi 1.15.0 drops support for py35.
|
||||||
setuptools<50.0.0 # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb244e9b27bc56750c44b7c85
|
setuptools<50.0.0 # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb244e9b27bc56750c44b7c85
|
||||||
|
|
||||||
@ -34,7 +35,7 @@ mock>=1.2; python_version >= '3.6'
|
|||||||
|
|
||||||
nose>=1.3.7
|
nose>=1.3.7
|
||||||
coverage>=3.6
|
coverage>=3.6
|
||||||
git+https://github.com/openstack/charms.openstack.git@stable/21.10#egg=charms.openstack
|
git+https://github.com/openstack/charms.openstack.git@stable/ussuri#egg=charms.openstack
|
||||||
#
|
#
|
||||||
# Revisit for removal / mock improvement:
|
# Revisit for removal / mock improvement:
|
||||||
#
|
#
|
||||||
|
40
tox.ini
40
tox.ini
@ -37,11 +37,24 @@ setenv = VIRTUAL_ENV={envdir}
|
|||||||
passenv = http_proxy https_proxy INTERFACE_PATH LAYER_PATH JUJU_REPOSITORY
|
passenv = http_proxy https_proxy INTERFACE_PATH LAYER_PATH JUJU_REPOSITORY
|
||||||
install_command =
|
install_command =
|
||||||
{toxinidir}/pip.sh install {opts} {packages}
|
{toxinidir}/pip.sh install {opts} {packages}
|
||||||
|
allowlist_externals =
|
||||||
|
charmcraft
|
||||||
|
bash
|
||||||
|
tox
|
||||||
|
rename.sh
|
||||||
deps =
|
deps =
|
||||||
-r{toxinidir}/requirements.txt
|
-r{toxinidir}/requirements.txt
|
||||||
|
|
||||||
[testenv:build]
|
[testenv:build]
|
||||||
basepython = python3
|
basepython = python3
|
||||||
|
deps = -r{toxinidir}/build-requirements.txt
|
||||||
|
commands =
|
||||||
|
charmcraft clean
|
||||||
|
charmcraft -v build
|
||||||
|
{toxinidir}/rename.sh
|
||||||
|
|
||||||
|
[testenv:build-reactive]
|
||||||
|
basepython = python3
|
||||||
commands =
|
commands =
|
||||||
charm-build --log-level DEBUG --use-lock-file-branches -o {toxinidir}/build/builds src {posargs}
|
charm-build --log-level DEBUG --use-lock-file-branches -o {toxinidir}/build/builds src {posargs}
|
||||||
|
|
||||||
@ -55,11 +68,6 @@ basepython = python3
|
|||||||
deps = -r{toxinidir}/test-requirements.txt
|
deps = -r{toxinidir}/test-requirements.txt
|
||||||
commands = stestr run --slowest {posargs}
|
commands = stestr run --slowest {posargs}
|
||||||
|
|
||||||
[testenv:py35]
|
|
||||||
basepython = python3.5
|
|
||||||
deps = -r{toxinidir}/test-requirements.txt
|
|
||||||
commands = stestr run --slowest {posargs}
|
|
||||||
|
|
||||||
[testenv:py36]
|
[testenv:py36]
|
||||||
basepython = python3.6
|
basepython = python3.6
|
||||||
deps = -r{toxinidir}/test-requirements.txt
|
deps = -r{toxinidir}/test-requirements.txt
|
||||||
@ -75,12 +83,34 @@ basepython = python3.8
|
|||||||
deps = -r{toxinidir}/test-requirements.txt
|
deps = -r{toxinidir}/test-requirements.txt
|
||||||
commands = stestr run --slowest {posargs}
|
commands = stestr run --slowest {posargs}
|
||||||
|
|
||||||
|
[testenv:py39]
|
||||||
|
basepython = python3.9
|
||||||
|
deps = -r{toxinidir}/test-requirements.txt
|
||||||
|
commands = stestr run --slowest {posargs}
|
||||||
|
|
||||||
|
[testenv:py310]
|
||||||
|
basepython = python3.10
|
||||||
|
deps = -r{toxinidir}/test-requirements.txt
|
||||||
|
commands = stestr run --slowest {posargs}
|
||||||
|
|
||||||
[testenv:pep8]
|
[testenv:pep8]
|
||||||
basepython = python3
|
basepython = python3
|
||||||
deps = flake8==3.9.2
|
deps = flake8==3.9.2
|
||||||
charm-tools==2.8.3
|
charm-tools==2.8.3
|
||||||
commands = flake8 {posargs} src unit_tests
|
commands = flake8 {posargs} src unit_tests
|
||||||
|
|
||||||
|
[testenv:func-target]
|
||||||
|
# Hack to get functional tests working in the charmcraft
|
||||||
|
# world. We should fix this.
|
||||||
|
basepython = python3
|
||||||
|
passenv = HOME TERM CS_* OS_* TEST_*
|
||||||
|
deps = -r{toxinidir}/src/test-requirements.txt
|
||||||
|
changedir = {toxinidir}/src
|
||||||
|
commands =
|
||||||
|
bash -c "if [ ! -f ../*.charm ]; then echo 'Charm does not exist. Run tox -e build'; exit 1; fi"
|
||||||
|
tox --version
|
||||||
|
tox -e func-target {posargs}
|
||||||
|
|
||||||
[testenv:cover]
|
[testenv:cover]
|
||||||
# Technique based heavily upon
|
# Technique based heavily upon
|
||||||
# https://github.com/openstack/nova/blob/master/tox.ini
|
# https://github.com/openstack/nova/blob/master/tox.ini
|
||||||
|
Loading…
Reference in New Issue
Block a user