Add Kinetic and Zed support
* sync charm-helpers to classic charms * change openstack-origin/source default to zed * align testing with zed * add new zed bundles * add zed bundles to tests.yaml * add zed tests to osci.yaml and .zuul.yaml * update build-on and run-on bases * add bindep.txt for py310 * sync tox.ini and requirements.txt for ruamel * use charmcraft_channel 2.0/stable * move interface/layer env vars to charmcraft.yaml * fix gss mirror_list and odr retrofit-uca-pocket * use local charm overlay for HA config instead of manually managing symlinks Depends-On: https://review.opendev.org/c/openstack/charm-octavia/+/858919 Change-Id: I759b60939a4fe2c9599d34e2ff64649426ffbf62
This commit is contained in:
Corey Bryant
committed by
Frode Nordahl
Frode Nordahl
parent
7cb77afe26
commit
ff317f99fc
@@ -1,4 +1,4 @@
|
|||||||
- project:
|
- project:
|
||||||
templates:
|
templates:
|
||||||
- openstack-python3-charm-yoga-jobs
|
- openstack-python3-charm-zed-jobs
|
||||||
- openstack-cover-jobs
|
- openstack-cover-jobs
|
||||||
|
|||||||
4
bindep.txt
Normal file
4
bindep.txt
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
libffi-dev [platform:dpkg]
|
||||||
|
libpq-dev [platform:dpkg]
|
||||||
|
libxml2-dev [platform:dpkg]
|
||||||
|
libxslt1-dev [platform:dpkg]
|
||||||
@@ -14,6 +14,8 @@ parts:
|
|||||||
- cargo
|
- cargo
|
||||||
build-environment:
|
build-environment:
|
||||||
- MAKEFLAGS: -j$(nproc)
|
- MAKEFLAGS: -j$(nproc)
|
||||||
|
- CHARM_INTERFACES_DIR: /root/project/interfaces/
|
||||||
|
- CHARM_LAYERS_DIR: /root/project/layers/
|
||||||
override-build: |
|
override-build: |
|
||||||
apt-get install ca-certificates -y
|
apt-get install ca-certificates -y
|
||||||
tox -e build-reactive
|
tox -e build-reactive
|
||||||
@@ -26,31 +28,52 @@ parts:
|
|||||||
# hooks directory.
|
# hooks directory.
|
||||||
cp -r $CRAFT_STAGE/* .
|
cp -r $CRAFT_STAGE/* .
|
||||||
# Charmcraft looks for this specific entry point.
|
# Charmcraft looks for this specific entry point.
|
||||||
mkdir src
|
mkdir -p src
|
||||||
ln -sf ../hooks/start src/charm.py
|
touch src/charm.py
|
||||||
|
chmod +x src/charm.py
|
||||||
|
|
||||||
bases:
|
bases:
|
||||||
- name: ubuntu
|
- build-on:
|
||||||
channel: "20.04"
|
- name: ubuntu
|
||||||
architectures: [amd64]
|
channel: "22.04"
|
||||||
- name: ubuntu
|
architectures: [amd64]
|
||||||
channel: "20.04"
|
run-on:
|
||||||
architectures: [arm64]
|
- name: ubuntu
|
||||||
- name: ubuntu
|
channel: "22.04"
|
||||||
channel: "20.04"
|
architectures: [amd64]
|
||||||
architectures: [ppc64el]
|
- name: ubuntu
|
||||||
- name: ubuntu
|
channel: "22.10"
|
||||||
channel: "20.04"
|
architectures: [amd64]
|
||||||
architectures: [s390x]
|
- build-on:
|
||||||
- name: ubuntu
|
- name: ubuntu
|
||||||
channel: "22.04"
|
channel: "22.04"
|
||||||
architectures: [amd64]
|
architectures: [arm64]
|
||||||
- name: ubuntu
|
run-on:
|
||||||
channel: "22.04"
|
- name: ubuntu
|
||||||
architectures: [arm64]
|
channel: "22.04"
|
||||||
- name: ubuntu
|
architectures: [arm64]
|
||||||
channel: "22.04"
|
- name: ubuntu
|
||||||
architectures: [ppc64el]
|
channel: "22.10"
|
||||||
- name: ubuntu
|
architectures: [arm64]
|
||||||
channel: "22.04"
|
- build-on:
|
||||||
architectures: [s390x]
|
- name: ubuntu
|
||||||
|
channel: "22.04"
|
||||||
|
architectures: [ppc64el]
|
||||||
|
run-on:
|
||||||
|
- name: ubuntu
|
||||||
|
channel: "22.04"
|
||||||
|
architectures: [ppc64el]
|
||||||
|
- name: ubuntu
|
||||||
|
channel: "22.10"
|
||||||
|
architectures: [ppc64el]
|
||||||
|
- build-on:
|
||||||
|
- name: ubuntu
|
||||||
|
channel: "22.04"
|
||||||
|
architectures: [s390x]
|
||||||
|
run-on:
|
||||||
|
- name: ubuntu
|
||||||
|
channel: "22.04"
|
||||||
|
architectures: [s390x]
|
||||||
|
- name: ubuntu
|
||||||
|
channel: "22.10"
|
||||||
|
architectures: [s390x]
|
||||||
|
|||||||
70
osci.yaml
70
osci.yaml
@@ -1,18 +1,17 @@
|
|||||||
- project:
|
- project:
|
||||||
templates:
|
templates:
|
||||||
- charm-unit-jobs-py38
|
|
||||||
- charm-unit-jobs-py310
|
- charm-unit-jobs-py310
|
||||||
check:
|
check:
|
||||||
jobs:
|
jobs:
|
||||||
- focal-xena-ha
|
- jammy-yoga-ha
|
||||||
- focal-xena-ha-ovn
|
- jammy-yoga-ha-ovn
|
||||||
- focal-yoga-ha:
|
- jammy-zed-ha:
|
||||||
voting: false
|
voting: false
|
||||||
- focal-yoga-ha-ovn:
|
- jammy-zed-ha-ovn:
|
||||||
voting: false
|
voting: false
|
||||||
- jammy-yoga-ha:
|
- kinetic-zed-ha:
|
||||||
voting: false
|
voting: false
|
||||||
- jammy-yoga-ha-ovn:
|
- kinetic-zed:
|
||||||
voting: false
|
voting: false
|
||||||
vars:
|
vars:
|
||||||
needs_charm_build: true
|
needs_charm_build: true
|
||||||
@@ -21,46 +20,47 @@
|
|||||||
charmcraft_channel: 2.0/stable
|
charmcraft_channel: 2.0/stable
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: focal-xena-ha
|
name: jammy-yoga-ha
|
||||||
parent: func-target
|
parent: func-target
|
||||||
dependencies:
|
dependencies:
|
||||||
- osci-lint
|
- osci-lint
|
||||||
- tox-py38
|
- name: tox-py310
|
||||||
|
soft: true
|
||||||
- charm-build
|
- charm-build
|
||||||
vars:
|
vars:
|
||||||
tox_extra_args: focal-xena-ha
|
tox_extra_args: jammy-yoga-ha
|
||||||
- job:
|
|
||||||
name: focal-xena-ha-ovn
|
|
||||||
parent: func-target
|
|
||||||
dependencies:
|
|
||||||
- focal-xena-ha
|
|
||||||
vars:
|
|
||||||
tox_extra_args: focal-xena-ha-ovn
|
|
||||||
- job:
|
|
||||||
name: focal-yoga-ha
|
|
||||||
parent: func-target
|
|
||||||
dependencies:
|
|
||||||
- focal-xena-ha
|
|
||||||
vars:
|
|
||||||
tox_extra_args: focal-yoga-ha
|
|
||||||
- job:
|
|
||||||
name: focal-yoga-ha-ovn
|
|
||||||
parent: func-target
|
|
||||||
dependencies:
|
|
||||||
- focal-xena-ha
|
|
||||||
vars:
|
|
||||||
tox_extra_args: focal-yoga-ha-ovn
|
|
||||||
- job:
|
- job:
|
||||||
name: jammy-yoga-ha-ovn
|
name: jammy-yoga-ha-ovn
|
||||||
parent: func-target
|
parent: func-target
|
||||||
dependencies:
|
dependencies:
|
||||||
- focal-xena-ha
|
- jammy-yoga-ha
|
||||||
vars:
|
vars:
|
||||||
tox_extra_args: jammy-yoga-ha-ovn
|
tox_extra_args: jammy-yoga-ha-ovn
|
||||||
- job:
|
- job:
|
||||||
name: jammy-yoga-ha
|
name: jammy-zed-ha
|
||||||
parent: func-target
|
parent: func-target
|
||||||
dependencies:
|
dependencies:
|
||||||
- focal-xena-ha
|
- jammy-yoga-ha
|
||||||
vars:
|
vars:
|
||||||
tox_extra_args: jammy-yoga-ha
|
tox_extra_args: jammy-zed-ha
|
||||||
|
- job:
|
||||||
|
name: jammy-zed-ha-ovn
|
||||||
|
parent: func-target
|
||||||
|
dependencies:
|
||||||
|
- jammy-yoga-ha
|
||||||
|
vars:
|
||||||
|
tox_extra_args: jammy-zed-ha-ovn
|
||||||
|
- job:
|
||||||
|
name: kinetic-zed-ha
|
||||||
|
parent: func-target
|
||||||
|
dependencies:
|
||||||
|
- jammy-yoga-ha
|
||||||
|
vars:
|
||||||
|
tox_extra_args: kinetic-zed-ha
|
||||||
|
- job:
|
||||||
|
name: kinetic-zed-ha-ovn
|
||||||
|
parent: func-target
|
||||||
|
dependencies:
|
||||||
|
- jammy-yoga-ha
|
||||||
|
vars:
|
||||||
|
tox_extra_args: kinetic-zed-ha-ovn
|
||||||
|
|||||||
@@ -3,22 +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
|
||||||
#
|
#
|
||||||
# NOTE(lourot): This might look like a duplication of test-requirements.txt but
|
|
||||||
# some tox targets use only test-requirements.txt whereas charm-build uses only
|
|
||||||
# requirements.txt
|
|
||||||
setuptools<50.0.0 # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb244e9b27bc56750c44b7c85
|
|
||||||
|
|
||||||
# Build requirements
|
git+https://github.com/juju/charm-tools.git
|
||||||
cffi==1.14.6; python_version < '3.6' # cffi 1.15.0 drops support for py35.
|
|
||||||
cryptography<3.4
|
|
||||||
git+https://github.com/juju/charm-tools#egg=charm-tools
|
|
||||||
|
|
||||||
simplejson
|
simplejson
|
||||||
|
|
||||||
# Newer versions use keywords that didn't exist in python 3.5 yet (e.g.
|
|
||||||
# "ModuleNotFoundError")
|
|
||||||
# NOTE(lourot): This might look like a duplication of test-requirements.txt but
|
|
||||||
# some tox targets use only test-requirements.txt whereas charm-build uses only
|
|
||||||
# requirements.txt
|
|
||||||
importlib-metadata<3.0.0; python_version < '3.6'
|
|
||||||
importlib-resources<3.0.0; python_version < '3.6'
|
|
||||||
|
|||||||
@@ -18,8 +18,8 @@ description: |
|
|||||||
tags:
|
tags:
|
||||||
- openstack
|
- openstack
|
||||||
series:
|
series:
|
||||||
- focal
|
|
||||||
- jammy
|
- jammy
|
||||||
|
- kinetic
|
||||||
subordinate: false
|
subordinate: false
|
||||||
provides:
|
provides:
|
||||||
nrpe-external-master:
|
nrpe-external-master:
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
variables:
|
variables:
|
||||||
openstack-origin: &openstack-origin distro
|
openstack-origin: &openstack-origin distro
|
||||||
|
|
||||||
local_overlay_enabled: False
|
local_overlay_enabled: True
|
||||||
|
|
||||||
series: &series jammy
|
series: &series jammy
|
||||||
relations:
|
relations:
|
||||||
@@ -105,39 +105,39 @@ applications:
|
|||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
channel: yoga/edge
|
channel: latest/edge
|
||||||
keystone:
|
keystone:
|
||||||
charm: ch:keystone
|
charm: ch:keystone
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
channel: yoga/edge
|
channel: latest/edge
|
||||||
octavia-mysql-router:
|
octavia-mysql-router:
|
||||||
charm: ch:mysql-router
|
charm: ch:mysql-router
|
||||||
channel: 8.0/edge
|
channel: latest/edge
|
||||||
keystone-mysql-router:
|
keystone-mysql-router:
|
||||||
charm: ch:mysql-router
|
charm: ch:mysql-router
|
||||||
channel: 8.0/edge
|
channel: latest/edge
|
||||||
nova-mysql-router:
|
nova-mysql-router:
|
||||||
charm: ch:mysql-router
|
charm: ch:mysql-router
|
||||||
channel: 8.0/edge
|
channel: latest/edge
|
||||||
glance-mysql-router:
|
glance-mysql-router:
|
||||||
charm: ch:mysql-router
|
charm: ch:mysql-router
|
||||||
channel: 8.0/edge
|
channel: latest/edge
|
||||||
neutron-mysql-router:
|
neutron-mysql-router:
|
||||||
charm: ch:mysql-router
|
charm: ch:mysql-router
|
||||||
channel: 8.0/edge
|
channel: latest/edge
|
||||||
placement-mysql-router:
|
placement-mysql-router:
|
||||||
charm: ch:mysql-router
|
charm: ch:mysql-router
|
||||||
channel: 8.0/edge
|
channel: latest/edge
|
||||||
vault-mysql-router:
|
vault-mysql-router:
|
||||||
charm: ch:mysql-router
|
charm: ch:mysql-router
|
||||||
channel: 8.0/edge
|
channel: latest/edge
|
||||||
mysql-innodb-cluster:
|
mysql-innodb-cluster:
|
||||||
constraints: mem=3072M
|
constraints: mem=3072M
|
||||||
charm: ch:mysql-innodb-cluster
|
charm: ch:mysql-innodb-cluster
|
||||||
num_units: 3
|
num_units: 3
|
||||||
channel: 8.0/edge
|
channel: latest/edge
|
||||||
neutron-api:
|
neutron-api:
|
||||||
constraints: cores=4
|
constraints: cores=4
|
||||||
charm: ch:neutron-api
|
charm: ch:neutron-api
|
||||||
@@ -148,7 +148,7 @@ applications:
|
|||||||
flat-network-providers: physnet1
|
flat-network-providers: physnet1
|
||||||
enable-ml2-port-security: True
|
enable-ml2-port-security: True
|
||||||
neutron-security-groups: True
|
neutron-security-groups: True
|
||||||
channel: yoga/edge
|
channel: latest/edge
|
||||||
nova-cloud-controller:
|
nova-cloud-controller:
|
||||||
constraints: mem=7168M
|
constraints: mem=7168M
|
||||||
charm: ch:nova-cloud-controller
|
charm: ch:nova-cloud-controller
|
||||||
@@ -157,7 +157,7 @@ applications:
|
|||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
debug: True
|
debug: True
|
||||||
network-manager: Neutron
|
network-manager: Neutron
|
||||||
channel: yoga/edge
|
channel: latest/edge
|
||||||
nova-compute:
|
nova-compute:
|
||||||
constraints: mem=7168M
|
constraints: mem=7168M
|
||||||
charm: ch:nova-compute
|
charm: ch:nova-compute
|
||||||
@@ -165,11 +165,11 @@ applications:
|
|||||||
options:
|
options:
|
||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
debug: True
|
debug: True
|
||||||
channel: yoga/edge
|
channel: latest/edge
|
||||||
hacluster-octavia:
|
hacluster-octavia:
|
||||||
series: *series
|
series: *series
|
||||||
charm: ch:hacluster
|
charm: ch:hacluster
|
||||||
channel: 2.4/edge
|
channel: latest/edge
|
||||||
ovn-chassis-octavia:
|
ovn-chassis-octavia:
|
||||||
series: *series
|
series: *series
|
||||||
charm: ch:ovn-chassis
|
charm: ch:ovn-chassis
|
||||||
@@ -177,7 +177,7 @@ applications:
|
|||||||
octavia:
|
octavia:
|
||||||
constraints: cores=8
|
constraints: cores=8
|
||||||
series: *series
|
series: *series
|
||||||
charm: ../../../octavia_ubuntu-22.04-amd64.charm
|
charm: ../../../octavia_ubuntu-22.04-amd64_ubuntu-22.10-amd64.charm
|
||||||
num_units: 3
|
num_units: 3
|
||||||
options:
|
options:
|
||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
@@ -186,7 +186,7 @@ applications:
|
|||||||
rabbitmq-server:
|
rabbitmq-server:
|
||||||
charm: ch:rabbitmq-server
|
charm: ch:rabbitmq-server
|
||||||
num_units: 1
|
num_units: 1
|
||||||
channel: 3.9/edge
|
channel: latest/edge
|
||||||
glance-simplestreams-sync:
|
glance-simplestreams-sync:
|
||||||
charm: ch:glance-simplestreams-sync
|
charm: ch:glance-simplestreams-sync
|
||||||
num_units: 1
|
num_units: 1
|
||||||
@@ -204,6 +204,7 @@ applications:
|
|||||||
charm: ch:octavia-diskimage-retrofit
|
charm: ch:octavia-diskimage-retrofit
|
||||||
options:
|
options:
|
||||||
amp-image-tag: 'octavia-amphora'
|
amp-image-tag: 'octavia-amphora'
|
||||||
|
retrofit-uca-pocket: yoga
|
||||||
retrofit-series: *series
|
retrofit-series: *series
|
||||||
channel: latest/edge
|
channel: latest/edge
|
||||||
placement:
|
placement:
|
||||||
@@ -213,10 +214,10 @@ applications:
|
|||||||
options:
|
options:
|
||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
debug: true
|
debug: true
|
||||||
channel: yoga/edge
|
channel: latest/edge
|
||||||
neutron-api-plugin-ovn:
|
neutron-api-plugin-ovn:
|
||||||
charm: ch:neutron-api-plugin-ovn
|
charm: ch:neutron-api-plugin-ovn
|
||||||
channel: yoga/edge
|
channel: latest/edge
|
||||||
ovn-central:
|
ovn-central:
|
||||||
constraints: mem=3072M
|
constraints: mem=3072M
|
||||||
charm: ch:ovn-central
|
charm: ch:ovn-central
|
||||||
@@ -230,4 +231,4 @@ applications:
|
|||||||
vault:
|
vault:
|
||||||
charm: ch:vault
|
charm: ch:vault
|
||||||
num_units: 1
|
num_units: 1
|
||||||
channel: 1.7/edge
|
channel: latest/edge
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
variables:
|
variables:
|
||||||
openstack-origin: &openstack-origin distro
|
openstack-origin: &openstack-origin distro
|
||||||
|
|
||||||
local_overlay_enabled: False
|
local_overlay_enabled: True
|
||||||
|
|
||||||
series: &series jammy
|
series: &series jammy
|
||||||
relations:
|
relations:
|
||||||
@@ -97,39 +97,39 @@ applications:
|
|||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
channel: yoga/edge
|
channel: latest/edge
|
||||||
keystone:
|
keystone:
|
||||||
charm: ch:keystone
|
charm: ch:keystone
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
channel: yoga/edge
|
channel: latest/edge
|
||||||
octavia-mysql-router:
|
octavia-mysql-router:
|
||||||
charm: ch:mysql-router
|
charm: ch:mysql-router
|
||||||
channel: 8.0/edge
|
channel: latest/edge
|
||||||
keystone-mysql-router:
|
keystone-mysql-router:
|
||||||
charm: ch:mysql-router
|
charm: ch:mysql-router
|
||||||
channel: 8.0/edge
|
channel: latest/edge
|
||||||
nova-mysql-router:
|
nova-mysql-router:
|
||||||
charm: ch:mysql-router
|
charm: ch:mysql-router
|
||||||
channel: 8.0/edge
|
channel: latest/edge
|
||||||
glance-mysql-router:
|
glance-mysql-router:
|
||||||
charm: ch:mysql-router
|
charm: ch:mysql-router
|
||||||
channel: 8.0/edge
|
channel: latest/edge
|
||||||
neutron-mysql-router:
|
neutron-mysql-router:
|
||||||
charm: ch:mysql-router
|
charm: ch:mysql-router
|
||||||
channel: 8.0/edge
|
channel: latest/edge
|
||||||
placement-mysql-router:
|
placement-mysql-router:
|
||||||
charm: ch:mysql-router
|
charm: ch:mysql-router
|
||||||
channel: 8.0/edge
|
channel: latest/edge
|
||||||
vault-mysql-router:
|
vault-mysql-router:
|
||||||
charm: ch:mysql-router
|
charm: ch:mysql-router
|
||||||
channel: 8.0/edge
|
channel: latest/edge
|
||||||
mysql-innodb-cluster:
|
mysql-innodb-cluster:
|
||||||
constraints: mem=3072M
|
constraints: mem=3072M
|
||||||
charm: ch:mysql-innodb-cluster
|
charm: ch:mysql-innodb-cluster
|
||||||
num_units: 3
|
num_units: 3
|
||||||
channel: 8.0/edge
|
channel: latest/edge
|
||||||
neutron-api:
|
neutron-api:
|
||||||
charm: ch:neutron-api
|
charm: ch:neutron-api
|
||||||
num_units: 1
|
num_units: 1
|
||||||
@@ -141,7 +141,7 @@ applications:
|
|||||||
neutron-security-groups: True
|
neutron-security-groups: True
|
||||||
enable-dvr: True
|
enable-dvr: True
|
||||||
manage-neutron-plugin-legacy-mode: True
|
manage-neutron-plugin-legacy-mode: True
|
||||||
channel: yoga/edge
|
channel: latest/edge
|
||||||
neutron-openvswitch:
|
neutron-openvswitch:
|
||||||
series: *series
|
series: *series
|
||||||
charm: ch:neutron-openvswitch
|
charm: ch:neutron-openvswitch
|
||||||
@@ -153,7 +153,7 @@ applications:
|
|||||||
prevent-arp-spoofing: False
|
prevent-arp-spoofing: False
|
||||||
firewall-driver: openvswitch
|
firewall-driver: openvswitch
|
||||||
bridge-mappings: physnet1:br-ex
|
bridge-mappings: physnet1:br-ex
|
||||||
channel: yoga/edge
|
channel: latest/edge
|
||||||
neutron-openvswitch-octavia:
|
neutron-openvswitch-octavia:
|
||||||
series: *series
|
series: *series
|
||||||
charm: ch:neutron-openvswitch
|
charm: ch:neutron-openvswitch
|
||||||
@@ -162,7 +162,7 @@ applications:
|
|||||||
debug: True
|
debug: True
|
||||||
prevent-arp-spoofing: False
|
prevent-arp-spoofing: False
|
||||||
firewall-driver: openvswitch
|
firewall-driver: openvswitch
|
||||||
channel: yoga/edge
|
channel: latest/edge
|
||||||
nova-cloud-controller:
|
nova-cloud-controller:
|
||||||
constraints: mem=7168M
|
constraints: mem=7168M
|
||||||
charm: ch:nova-cloud-controller
|
charm: ch:nova-cloud-controller
|
||||||
@@ -171,7 +171,7 @@ applications:
|
|||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
debug: True
|
debug: True
|
||||||
network-manager: Neutron
|
network-manager: Neutron
|
||||||
channel: yoga/edge
|
channel: latest/edge
|
||||||
nova-compute:
|
nova-compute:
|
||||||
constraints: mem=7168M
|
constraints: mem=7168M
|
||||||
charm: ch:nova-compute
|
charm: ch:nova-compute
|
||||||
@@ -179,16 +179,16 @@ applications:
|
|||||||
options:
|
options:
|
||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
debug: True
|
debug: True
|
||||||
channel: yoga/edge
|
channel: latest/edge
|
||||||
hacluster-octavia:
|
hacluster-octavia:
|
||||||
series: *series
|
series: *series
|
||||||
charm: ch:hacluster
|
charm: ch:hacluster
|
||||||
num_units: 0
|
num_units: 0
|
||||||
channel: 2.4/edge
|
channel: latest/edge
|
||||||
octavia:
|
octavia:
|
||||||
constraints: cores=8
|
constraints: cores=8
|
||||||
series: *series
|
series: *series
|
||||||
charm: ../../../octavia_ubuntu-22.04-amd64.charm
|
charm: ../../../octavia_ubuntu-22.04-amd64_ubuntu-22.10-amd64.charm
|
||||||
num_units: 3
|
num_units: 3
|
||||||
options:
|
options:
|
||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
@@ -198,7 +198,7 @@ applications:
|
|||||||
rabbitmq-server:
|
rabbitmq-server:
|
||||||
charm: ch:rabbitmq-server
|
charm: ch:rabbitmq-server
|
||||||
num_units: 1
|
num_units: 1
|
||||||
channel: 3.9/edge
|
channel: latest/edge
|
||||||
glance-simplestreams-sync:
|
glance-simplestreams-sync:
|
||||||
charm: ch:glance-simplestreams-sync
|
charm: ch:glance-simplestreams-sync
|
||||||
num_units: 1
|
num_units: 1
|
||||||
@@ -216,6 +216,7 @@ applications:
|
|||||||
charm: ch:octavia-diskimage-retrofit
|
charm: ch:octavia-diskimage-retrofit
|
||||||
options:
|
options:
|
||||||
amp-image-tag: 'octavia-amphora'
|
amp-image-tag: 'octavia-amphora'
|
||||||
|
retrofit-uca-pocket: yoga
|
||||||
retrofit-series: *series
|
retrofit-series: *series
|
||||||
channel: latest/edge
|
channel: latest/edge
|
||||||
placement:
|
placement:
|
||||||
@@ -225,8 +226,8 @@ applications:
|
|||||||
options:
|
options:
|
||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
debug: true
|
debug: true
|
||||||
channel: yoga/edge
|
channel: latest/edge
|
||||||
vault:
|
vault:
|
||||||
charm: ch:vault
|
charm: ch:vault
|
||||||
num_units: 1
|
num_units: 1
|
||||||
channel: 1.7/edge
|
channel: latest/edge
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
variables:
|
variables:
|
||||||
openstack-origin: &openstack-origin cloud:focal-yoga
|
openstack-origin: &openstack-origin cloud:jammy-zed
|
||||||
|
|
||||||
local_overlay_enabled: False
|
local_overlay_enabled: True
|
||||||
|
|
||||||
series: &series focal
|
series: &series jammy
|
||||||
relations:
|
relations:
|
||||||
- - glance:image-service
|
- - glance:image-service
|
||||||
- nova-cloud-controller:image-service
|
- nova-cloud-controller:image-service
|
||||||
@@ -105,39 +105,39 @@ applications:
|
|||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
channel: yoga/edge
|
channel: latest/edge
|
||||||
keystone:
|
keystone:
|
||||||
charm: ch:keystone
|
charm: ch:keystone
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
channel: yoga/edge
|
channel: latest/edge
|
||||||
octavia-mysql-router:
|
octavia-mysql-router:
|
||||||
charm: ch:mysql-router
|
charm: ch:mysql-router
|
||||||
channel: 8.0.19/edge
|
channel: latest/edge
|
||||||
keystone-mysql-router:
|
keystone-mysql-router:
|
||||||
charm: ch:mysql-router
|
charm: ch:mysql-router
|
||||||
channel: 8.0.19/edge
|
channel: latest/edge
|
||||||
nova-mysql-router:
|
nova-mysql-router:
|
||||||
charm: ch:mysql-router
|
charm: ch:mysql-router
|
||||||
channel: 8.0.19/edge
|
channel: latest/edge
|
||||||
glance-mysql-router:
|
glance-mysql-router:
|
||||||
charm: ch:mysql-router
|
charm: ch:mysql-router
|
||||||
channel: 8.0.19/edge
|
channel: latest/edge
|
||||||
neutron-mysql-router:
|
neutron-mysql-router:
|
||||||
charm: ch:mysql-router
|
charm: ch:mysql-router
|
||||||
channel: 8.0.19/edge
|
channel: latest/edge
|
||||||
placement-mysql-router:
|
placement-mysql-router:
|
||||||
charm: ch:mysql-router
|
charm: ch:mysql-router
|
||||||
channel: 8.0.19/edge
|
channel: latest/edge
|
||||||
vault-mysql-router:
|
vault-mysql-router:
|
||||||
charm: ch:mysql-router
|
charm: ch:mysql-router
|
||||||
channel: 8.0.19/edge
|
channel: latest/edge
|
||||||
mysql-innodb-cluster:
|
mysql-innodb-cluster:
|
||||||
constraints: mem=3072M
|
constraints: mem=3072M
|
||||||
charm: ch:mysql-innodb-cluster
|
charm: ch:mysql-innodb-cluster
|
||||||
num_units: 3
|
num_units: 3
|
||||||
channel: 8.0.19/edge
|
channel: latest/edge
|
||||||
neutron-api:
|
neutron-api:
|
||||||
constraints: cores=4
|
constraints: cores=4
|
||||||
charm: ch:neutron-api
|
charm: ch:neutron-api
|
||||||
@@ -148,7 +148,7 @@ applications:
|
|||||||
flat-network-providers: physnet1
|
flat-network-providers: physnet1
|
||||||
enable-ml2-port-security: True
|
enable-ml2-port-security: True
|
||||||
neutron-security-groups: True
|
neutron-security-groups: True
|
||||||
channel: yoga/edge
|
channel: latest/edge
|
||||||
nova-cloud-controller:
|
nova-cloud-controller:
|
||||||
constraints: mem=7168M
|
constraints: mem=7168M
|
||||||
charm: ch:nova-cloud-controller
|
charm: ch:nova-cloud-controller
|
||||||
@@ -157,7 +157,7 @@ applications:
|
|||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
debug: True
|
debug: True
|
||||||
network-manager: Neutron
|
network-manager: Neutron
|
||||||
channel: yoga/edge
|
channel: latest/edge
|
||||||
nova-compute:
|
nova-compute:
|
||||||
constraints: mem=7168M
|
constraints: mem=7168M
|
||||||
charm: ch:nova-compute
|
charm: ch:nova-compute
|
||||||
@@ -165,11 +165,11 @@ applications:
|
|||||||
options:
|
options:
|
||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
debug: True
|
debug: True
|
||||||
channel: yoga/edge
|
channel: latest/edge
|
||||||
hacluster-octavia:
|
hacluster-octavia:
|
||||||
series: *series
|
series: *series
|
||||||
charm: ch:hacluster
|
charm: ch:hacluster
|
||||||
channel: 2.0.3/edge
|
channel: latest/edge
|
||||||
ovn-chassis-octavia:
|
ovn-chassis-octavia:
|
||||||
series: *series
|
series: *series
|
||||||
charm: ch:ovn-chassis
|
charm: ch:ovn-chassis
|
||||||
@@ -177,7 +177,7 @@ applications:
|
|||||||
octavia:
|
octavia:
|
||||||
constraints: cores=8
|
constraints: cores=8
|
||||||
series: *series
|
series: *series
|
||||||
charm: ../../../octavia_ubuntu-20.04-amd64.charm
|
charm: ../../../octavia_ubuntu-22.04-amd64_ubuntu-22.10-amd64.charm
|
||||||
num_units: 3
|
num_units: 3
|
||||||
options:
|
options:
|
||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
@@ -186,7 +186,7 @@ applications:
|
|||||||
rabbitmq-server:
|
rabbitmq-server:
|
||||||
charm: ch:rabbitmq-server
|
charm: ch:rabbitmq-server
|
||||||
num_units: 1
|
num_units: 1
|
||||||
channel: 3.8/edge
|
channel: latest/edge
|
||||||
glance-simplestreams-sync:
|
glance-simplestreams-sync:
|
||||||
charm: ch:glance-simplestreams-sync
|
charm: ch:glance-simplestreams-sync
|
||||||
num_units: 1
|
num_units: 1
|
||||||
@@ -196,17 +196,17 @@ applications:
|
|||||||
name_prefix: 'ubuntu:released',
|
name_prefix: 'ubuntu:released',
|
||||||
path: 'streams/v1/index.sjson', max: 1,
|
path: 'streams/v1/index.sjson', max: 1,
|
||||||
item_filters: [
|
item_filters: [
|
||||||
'release~(focal)',
|
'release~(jammy)',
|
||||||
'arch~(x86_64|amd64)',
|
'arch~(x86_64|amd64)',
|
||||||
'ftype~(disk1.img|disk.img)']}]"
|
'ftype~(disk1.img|disk.img)']}]"
|
||||||
channel: yoga/edge
|
channel: latest/edge
|
||||||
octavia-diskimage-retrofit:
|
octavia-diskimage-retrofit:
|
||||||
charm: ch:octavia-diskimage-retrofit
|
charm: ch:octavia-diskimage-retrofit
|
||||||
options:
|
options:
|
||||||
amp-image-tag: 'octavia-amphora'
|
amp-image-tag: 'octavia-amphora'
|
||||||
retrofit-series: *series
|
retrofit-series: *series
|
||||||
retrofit-uca-pocket: yoga
|
retrofit-uca-pocket: zed
|
||||||
channel: yoga/edge
|
channel: latest/edge
|
||||||
placement:
|
placement:
|
||||||
charm: ch:placement
|
charm: ch:placement
|
||||||
num_units: 1
|
num_units: 1
|
||||||
@@ -214,10 +214,10 @@ applications:
|
|||||||
options:
|
options:
|
||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
debug: true
|
debug: true
|
||||||
channel: yoga/edge
|
channel: latest/edge
|
||||||
neutron-api-plugin-ovn:
|
neutron-api-plugin-ovn:
|
||||||
charm: ch:neutron-api-plugin-ovn
|
charm: ch:neutron-api-plugin-ovn
|
||||||
channel: yoga/edge
|
channel: latest/edge
|
||||||
ovn-central:
|
ovn-central:
|
||||||
constraints: mem=3072M
|
constraints: mem=3072M
|
||||||
charm: ch:ovn-central
|
charm: ch:ovn-central
|
||||||
@@ -231,4 +231,4 @@ applications:
|
|||||||
vault:
|
vault:
|
||||||
charm: ch:vault
|
charm: ch:vault
|
||||||
num_units: 1
|
num_units: 1
|
||||||
channel: 1.7/edge
|
channel: latest/edge
|
||||||
@@ -1,9 +1,9 @@
|
|||||||
variables:
|
variables:
|
||||||
openstack-origin: &openstack-origin cloud:focal-xena
|
openstack-origin: &openstack-origin cloud:jammy-zed
|
||||||
|
|
||||||
local_overlay_enabled: False
|
local_overlay_enabled: True
|
||||||
|
|
||||||
series: &series focal
|
series: &series jammy
|
||||||
relations:
|
relations:
|
||||||
- - glance:image-service
|
- - glance:image-service
|
||||||
- nova-cloud-controller:image-service
|
- nova-cloud-controller:image-service
|
||||||
@@ -93,55 +93,44 @@ relations:
|
|||||||
- ["vault-mysql-router:db-router", "mysql-innodb-cluster:db-router"]
|
- ["vault-mysql-router:db-router", "mysql-innodb-cluster:db-router"]
|
||||||
applications:
|
applications:
|
||||||
glance:
|
glance:
|
||||||
series: *series
|
|
||||||
charm: ch:glance
|
charm: ch:glance
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
channel: yoga/edge
|
channel: latest/edge
|
||||||
keystone:
|
keystone:
|
||||||
series: *series
|
|
||||||
charm: ch:keystone
|
charm: ch:keystone
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
channel: yoga/edge
|
channel: latest/edge
|
||||||
octavia-mysql-router:
|
octavia-mysql-router:
|
||||||
series: *series
|
|
||||||
charm: ch:mysql-router
|
charm: ch:mysql-router
|
||||||
channel: 8.0.19/edge
|
channel: latest/edge
|
||||||
keystone-mysql-router:
|
keystone-mysql-router:
|
||||||
series: *series
|
|
||||||
charm: ch:mysql-router
|
charm: ch:mysql-router
|
||||||
channel: 8.0.19/edge
|
channel: latest/edge
|
||||||
nova-mysql-router:
|
nova-mysql-router:
|
||||||
series: *series
|
|
||||||
charm: ch:mysql-router
|
charm: ch:mysql-router
|
||||||
channel: 8.0.19/edge
|
channel: latest/edge
|
||||||
glance-mysql-router:
|
glance-mysql-router:
|
||||||
series: *series
|
|
||||||
charm: ch:mysql-router
|
charm: ch:mysql-router
|
||||||
channel: 8.0.19/edge
|
channel: latest/edge
|
||||||
neutron-mysql-router:
|
neutron-mysql-router:
|
||||||
series: *series
|
|
||||||
charm: ch:mysql-router
|
charm: ch:mysql-router
|
||||||
channel: 8.0.19/edge
|
channel: latest/edge
|
||||||
placement-mysql-router:
|
placement-mysql-router:
|
||||||
series: *series
|
|
||||||
charm: ch:mysql-router
|
charm: ch:mysql-router
|
||||||
channel: 8.0.19/edge
|
channel: latest/edge
|
||||||
vault-mysql-router:
|
vault-mysql-router:
|
||||||
series: *series
|
|
||||||
charm: ch:mysql-router
|
charm: ch:mysql-router
|
||||||
channel: 8.0.19/edge
|
channel: latest/edge
|
||||||
mysql-innodb-cluster:
|
mysql-innodb-cluster:
|
||||||
series: *series
|
|
||||||
constraints: mem=3072M
|
constraints: mem=3072M
|
||||||
charm: ch:mysql-innodb-cluster
|
charm: ch:mysql-innodb-cluster
|
||||||
num_units: 3
|
num_units: 3
|
||||||
channel: 8.0.19/edge
|
channel: latest/edge
|
||||||
neutron-api:
|
neutron-api:
|
||||||
series: *series
|
|
||||||
charm: ch:neutron-api
|
charm: ch:neutron-api
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
@@ -152,7 +141,7 @@ applications:
|
|||||||
neutron-security-groups: True
|
neutron-security-groups: True
|
||||||
enable-dvr: True
|
enable-dvr: True
|
||||||
manage-neutron-plugin-legacy-mode: True
|
manage-neutron-plugin-legacy-mode: True
|
||||||
channel: yoga/edge
|
channel: latest/edge
|
||||||
neutron-openvswitch:
|
neutron-openvswitch:
|
||||||
series: *series
|
series: *series
|
||||||
charm: ch:neutron-openvswitch
|
charm: ch:neutron-openvswitch
|
||||||
@@ -164,7 +153,7 @@ applications:
|
|||||||
prevent-arp-spoofing: False
|
prevent-arp-spoofing: False
|
||||||
firewall-driver: openvswitch
|
firewall-driver: openvswitch
|
||||||
bridge-mappings: physnet1:br-ex
|
bridge-mappings: physnet1:br-ex
|
||||||
channel: yoga/edge
|
channel: latest/edge
|
||||||
neutron-openvswitch-octavia:
|
neutron-openvswitch-octavia:
|
||||||
series: *series
|
series: *series
|
||||||
charm: ch:neutron-openvswitch
|
charm: ch:neutron-openvswitch
|
||||||
@@ -173,9 +162,8 @@ applications:
|
|||||||
debug: True
|
debug: True
|
||||||
prevent-arp-spoofing: False
|
prevent-arp-spoofing: False
|
||||||
firewall-driver: openvswitch
|
firewall-driver: openvswitch
|
||||||
channel: yoga/edge
|
channel: latest/edge
|
||||||
nova-cloud-controller:
|
nova-cloud-controller:
|
||||||
series: *series
|
|
||||||
constraints: mem=7168M
|
constraints: mem=7168M
|
||||||
charm: ch:nova-cloud-controller
|
charm: ch:nova-cloud-controller
|
||||||
num_units: 1
|
num_units: 1
|
||||||
@@ -183,25 +171,23 @@ applications:
|
|||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
debug: True
|
debug: True
|
||||||
network-manager: Neutron
|
network-manager: Neutron
|
||||||
channel: yoga/edge
|
channel: latest/edge
|
||||||
nova-compute:
|
nova-compute:
|
||||||
series: *series
|
|
||||||
constraints: mem=7168M
|
constraints: mem=7168M
|
||||||
charm: ch:nova-compute
|
charm: ch:nova-compute
|
||||||
num_units: 2
|
num_units: 2
|
||||||
options:
|
options:
|
||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
debug: True
|
debug: True
|
||||||
channel: yoga/edge
|
channel: latest/edge
|
||||||
hacluster-octavia:
|
hacluster-octavia:
|
||||||
series: *series
|
|
||||||
charm: ch:hacluster
|
charm: ch:hacluster
|
||||||
num_units: 0
|
num_units: 0
|
||||||
channel: 2.0.3/edge
|
channel: latest/edge
|
||||||
octavia:
|
octavia:
|
||||||
constraints: cores=8
|
constraints: cores=8
|
||||||
series: *series
|
series: *series
|
||||||
charm: ../../../octavia_ubuntu-20.04-amd64.charm
|
charm: ../../../octavia_ubuntu-22.04-amd64_ubuntu-22.10-amd64.charm
|
||||||
num_units: 3
|
num_units: 3
|
||||||
options:
|
options:
|
||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
@@ -209,12 +195,10 @@ applications:
|
|||||||
loadbalancer-topology: 'ACTIVE_STANDBY'
|
loadbalancer-topology: 'ACTIVE_STANDBY'
|
||||||
vip: 'ADD YOUR VIP HERE'
|
vip: 'ADD YOUR VIP HERE'
|
||||||
rabbitmq-server:
|
rabbitmq-server:
|
||||||
series: *series
|
|
||||||
charm: ch:rabbitmq-server
|
charm: ch:rabbitmq-server
|
||||||
num_units: 1
|
num_units: 1
|
||||||
channel: 3.8/edge
|
channel: latest/edge
|
||||||
glance-simplestreams-sync:
|
glance-simplestreams-sync:
|
||||||
series: *series
|
|
||||||
charm: ch:glance-simplestreams-sync
|
charm: ch:glance-simplestreams-sync
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
@@ -223,29 +207,26 @@ applications:
|
|||||||
name_prefix: 'ubuntu:released',
|
name_prefix: 'ubuntu:released',
|
||||||
path: 'streams/v1/index.sjson', max: 1,
|
path: 'streams/v1/index.sjson', max: 1,
|
||||||
item_filters: [
|
item_filters: [
|
||||||
'release~(focal)',
|
'release~(jammy)',
|
||||||
'arch~(x86_64|amd64)',
|
'arch~(x86_64|amd64)',
|
||||||
'ftype~(disk1.img|disk.img)']}]"
|
'ftype~(disk1.img|disk.img)']}]"
|
||||||
channel: yoga/edge
|
channel: latest/edge
|
||||||
octavia-diskimage-retrofit:
|
octavia-diskimage-retrofit:
|
||||||
series: *series
|
|
||||||
charm: ch:octavia-diskimage-retrofit
|
charm: ch:octavia-diskimage-retrofit
|
||||||
options:
|
options:
|
||||||
amp-image-tag: 'octavia-amphora'
|
amp-image-tag: 'octavia-amphora'
|
||||||
retrofit-series: *series
|
retrofit-series: *series
|
||||||
retrofit-uca-pocket: xena
|
retrofit-uca-pocket: zed
|
||||||
channel: yoga/edge
|
channel: latest/edge
|
||||||
placement:
|
placement:
|
||||||
series: *series
|
|
||||||
charm: ch:placement
|
charm: ch:placement
|
||||||
num_units: 1
|
num_units: 1
|
||||||
constraints: mem=1G
|
constraints: mem=1G
|
||||||
options:
|
options:
|
||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
debug: true
|
debug: true
|
||||||
channel: yoga/edge
|
channel: latest/edge
|
||||||
vault:
|
vault:
|
||||||
series: *series
|
|
||||||
charm: ch:vault
|
charm: ch:vault
|
||||||
num_units: 1
|
num_units: 1
|
||||||
channel: 1.7/edge
|
channel: latest/edge
|
||||||
@@ -1,9 +1,9 @@
|
|||||||
variables:
|
variables:
|
||||||
openstack-origin: &openstack-origin cloud:focal-xena
|
openstack-origin: &openstack-origin distro
|
||||||
|
|
||||||
local_overlay_enabled: False
|
local_overlay_enabled: True
|
||||||
|
|
||||||
series: &series focal
|
series: &series kinetic
|
||||||
relations:
|
relations:
|
||||||
- - glance:image-service
|
- - glance:image-service
|
||||||
- nova-cloud-controller:image-service
|
- nova-cloud-controller:image-service
|
||||||
@@ -105,39 +105,39 @@ applications:
|
|||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
channel: yoga/edge
|
channel: latest/edge
|
||||||
keystone:
|
keystone:
|
||||||
charm: ch:keystone
|
charm: ch:keystone
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
channel: yoga/edge
|
channel: latest/edge
|
||||||
octavia-mysql-router:
|
octavia-mysql-router:
|
||||||
charm: ch:mysql-router
|
charm: ch:mysql-router
|
||||||
channel: 8.0/edge
|
channel: latest/edge
|
||||||
keystone-mysql-router:
|
keystone-mysql-router:
|
||||||
charm: ch:mysql-router
|
charm: ch:mysql-router
|
||||||
channel: 8.0/edge
|
channel: latest/edge
|
||||||
nova-mysql-router:
|
nova-mysql-router:
|
||||||
charm: ch:mysql-router
|
charm: ch:mysql-router
|
||||||
channel: 8.0/edge
|
channel: latest/edge
|
||||||
glance-mysql-router:
|
glance-mysql-router:
|
||||||
charm: ch:mysql-router
|
charm: ch:mysql-router
|
||||||
channel: 8.0/edge
|
channel: latest/edge
|
||||||
neutron-mysql-router:
|
neutron-mysql-router:
|
||||||
charm: ch:mysql-router
|
charm: ch:mysql-router
|
||||||
channel: 8.0/edge
|
channel: latest/edge
|
||||||
placement-mysql-router:
|
placement-mysql-router:
|
||||||
charm: ch:mysql-router
|
charm: ch:mysql-router
|
||||||
channel: 8.0/edge
|
channel: latest/edge
|
||||||
vault-mysql-router:
|
vault-mysql-router:
|
||||||
charm: ch:mysql-router
|
charm: ch:mysql-router
|
||||||
channel: 8.0/edge
|
channel: latest/edge
|
||||||
mysql-innodb-cluster:
|
mysql-innodb-cluster:
|
||||||
constraints: mem=3072M
|
constraints: mem=3072M
|
||||||
charm: ch:mysql-innodb-cluster
|
charm: ch:mysql-innodb-cluster
|
||||||
num_units: 3
|
num_units: 3
|
||||||
channel: 8.0/edge
|
channel: latest/edge
|
||||||
neutron-api:
|
neutron-api:
|
||||||
constraints: cores=4
|
constraints: cores=4
|
||||||
charm: ch:neutron-api
|
charm: ch:neutron-api
|
||||||
@@ -148,7 +148,7 @@ applications:
|
|||||||
flat-network-providers: physnet1
|
flat-network-providers: physnet1
|
||||||
enable-ml2-port-security: True
|
enable-ml2-port-security: True
|
||||||
neutron-security-groups: True
|
neutron-security-groups: True
|
||||||
channel: yoga/edge
|
channel: latest/edge
|
||||||
nova-cloud-controller:
|
nova-cloud-controller:
|
||||||
constraints: mem=7168M
|
constraints: mem=7168M
|
||||||
charm: ch:nova-cloud-controller
|
charm: ch:nova-cloud-controller
|
||||||
@@ -157,7 +157,7 @@ applications:
|
|||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
debug: True
|
debug: True
|
||||||
network-manager: Neutron
|
network-manager: Neutron
|
||||||
channel: yoga/edge
|
channel: latest/edge
|
||||||
nova-compute:
|
nova-compute:
|
||||||
constraints: mem=7168M
|
constraints: mem=7168M
|
||||||
charm: ch:nova-compute
|
charm: ch:nova-compute
|
||||||
@@ -165,11 +165,11 @@ applications:
|
|||||||
options:
|
options:
|
||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
debug: True
|
debug: True
|
||||||
channel: yoga/edge
|
channel: latest/edge
|
||||||
hacluster-octavia:
|
hacluster-octavia:
|
||||||
series: *series
|
series: *series
|
||||||
charm: ch:hacluster
|
charm: ch:hacluster
|
||||||
channel: 2.0.3/edge
|
channel: latest/edge
|
||||||
ovn-chassis-octavia:
|
ovn-chassis-octavia:
|
||||||
series: *series
|
series: *series
|
||||||
charm: ch:ovn-chassis
|
charm: ch:ovn-chassis
|
||||||
@@ -179,7 +179,7 @@ applications:
|
|||||||
octavia:
|
octavia:
|
||||||
constraints: cores=8
|
constraints: cores=8
|
||||||
series: *series
|
series: *series
|
||||||
charm: ../../../octavia_ubuntu-20.04-amd64.charm
|
charm: ../../../octavia_ubuntu-22.04-amd64_ubuntu-22.10-amd64.charm
|
||||||
num_units: 3
|
num_units: 3
|
||||||
options:
|
options:
|
||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
@@ -188,7 +188,7 @@ applications:
|
|||||||
rabbitmq-server:
|
rabbitmq-server:
|
||||||
charm: ch:rabbitmq-server
|
charm: ch:rabbitmq-server
|
||||||
num_units: 1
|
num_units: 1
|
||||||
channel: 3.8/edge
|
channel: latest/edge
|
||||||
glance-simplestreams-sync:
|
glance-simplestreams-sync:
|
||||||
charm: ch:glance-simplestreams-sync
|
charm: ch:glance-simplestreams-sync
|
||||||
num_units: 1
|
num_units: 1
|
||||||
@@ -198,17 +198,16 @@ applications:
|
|||||||
name_prefix: 'ubuntu:released',
|
name_prefix: 'ubuntu:released',
|
||||||
path: 'streams/v1/index.sjson', max: 1,
|
path: 'streams/v1/index.sjson', max: 1,
|
||||||
item_filters: [
|
item_filters: [
|
||||||
'release~(focal)',
|
'release~(kinetic)',
|
||||||
'arch~(x86_64|amd64)',
|
'arch~(x86_64|amd64)',
|
||||||
'ftype~(disk1.img|disk.img)']}]"
|
'ftype~(disk1.img|disk.img)']}]"
|
||||||
channel: yoga/edge
|
channel: latest/edge
|
||||||
octavia-diskimage-retrofit:
|
octavia-diskimage-retrofit:
|
||||||
charm: ch:octavia-diskimage-retrofit
|
charm: ch:octavia-diskimage-retrofit
|
||||||
options:
|
options:
|
||||||
amp-image-tag: 'octavia-amphora'
|
amp-image-tag: 'octavia-amphora'
|
||||||
retrofit-series: *series
|
retrofit-series: *series
|
||||||
retrofit-uca-pocket: xena
|
channel: latest/edge
|
||||||
channel: yoga/edge
|
|
||||||
placement:
|
placement:
|
||||||
charm: ch:placement
|
charm: ch:placement
|
||||||
num_units: 1
|
num_units: 1
|
||||||
@@ -216,10 +215,10 @@ applications:
|
|||||||
options:
|
options:
|
||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
debug: true
|
debug: true
|
||||||
channel: yoga/edge
|
channel: latest/edge
|
||||||
neutron-api-plugin-ovn:
|
neutron-api-plugin-ovn:
|
||||||
charm: ch:neutron-api-plugin-ovn
|
charm: ch:neutron-api-plugin-ovn
|
||||||
channel: yoga/edge
|
channel: latest/edge
|
||||||
ovn-central:
|
ovn-central:
|
||||||
constraints: mem=3072M
|
constraints: mem=3072M
|
||||||
charm: ch:ovn-central
|
charm: ch:ovn-central
|
||||||
@@ -235,4 +234,4 @@ applications:
|
|||||||
vault:
|
vault:
|
||||||
charm: ch:vault
|
charm: ch:vault
|
||||||
num_units: 1
|
num_units: 1
|
||||||
channel: 1.7/edge
|
channel: latest/edge
|
||||||
@@ -1,9 +1,9 @@
|
|||||||
variables:
|
variables:
|
||||||
openstack-origin: &openstack-origin cloud:focal-yoga
|
openstack-origin: &openstack-origin distro
|
||||||
|
|
||||||
local_overlay_enabled: False
|
local_overlay_enabled: True
|
||||||
|
|
||||||
series: &series focal
|
series: &series kinetic
|
||||||
relations:
|
relations:
|
||||||
- - glance:image-service
|
- - glance:image-service
|
||||||
- nova-cloud-controller:image-service
|
- nova-cloud-controller:image-service
|
||||||
@@ -97,39 +97,39 @@ applications:
|
|||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
channel: yoga/edge
|
channel: latest/edge
|
||||||
keystone:
|
keystone:
|
||||||
charm: ch:keystone
|
charm: ch:keystone
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
channel: yoga/edge
|
channel: latest/edge
|
||||||
octavia-mysql-router:
|
octavia-mysql-router:
|
||||||
charm: ch:mysql-router
|
charm: ch:mysql-router
|
||||||
channel: 8.0.19/edge
|
channel: latest/edge
|
||||||
keystone-mysql-router:
|
keystone-mysql-router:
|
||||||
charm: ch:mysql-router
|
charm: ch:mysql-router
|
||||||
channel: 8.0.19/edge
|
channel: latest/edge
|
||||||
nova-mysql-router:
|
nova-mysql-router:
|
||||||
charm: ch:mysql-router
|
charm: ch:mysql-router
|
||||||
channel: 8.0.19/edge
|
channel: latest/edge
|
||||||
glance-mysql-router:
|
glance-mysql-router:
|
||||||
charm: ch:mysql-router
|
charm: ch:mysql-router
|
||||||
channel: 8.0.19/edge
|
channel: latest/edge
|
||||||
neutron-mysql-router:
|
neutron-mysql-router:
|
||||||
charm: ch:mysql-router
|
charm: ch:mysql-router
|
||||||
channel: 8.0.19/edge
|
channel: latest/edge
|
||||||
placement-mysql-router:
|
placement-mysql-router:
|
||||||
charm: ch:mysql-router
|
charm: ch:mysql-router
|
||||||
channel: 8.0.19/edge
|
channel: latest/edge
|
||||||
vault-mysql-router:
|
vault-mysql-router:
|
||||||
charm: ch:mysql-router
|
charm: ch:mysql-router
|
||||||
channel: 8.0.19/edge
|
channel: latest/edge
|
||||||
mysql-innodb-cluster:
|
mysql-innodb-cluster:
|
||||||
constraints: mem=3072M
|
constraints: mem=3072M
|
||||||
charm: ch:mysql-innodb-cluster
|
charm: ch:mysql-innodb-cluster
|
||||||
num_units: 3
|
num_units: 3
|
||||||
channel: 8.0.19/edge
|
channel: latest/edge
|
||||||
neutron-api:
|
neutron-api:
|
||||||
charm: ch:neutron-api
|
charm: ch:neutron-api
|
||||||
num_units: 1
|
num_units: 1
|
||||||
@@ -141,7 +141,7 @@ applications:
|
|||||||
neutron-security-groups: True
|
neutron-security-groups: True
|
||||||
enable-dvr: True
|
enable-dvr: True
|
||||||
manage-neutron-plugin-legacy-mode: True
|
manage-neutron-plugin-legacy-mode: True
|
||||||
channel: yoga/edge
|
channel: latest/edge
|
||||||
neutron-openvswitch:
|
neutron-openvswitch:
|
||||||
series: *series
|
series: *series
|
||||||
charm: ch:neutron-openvswitch
|
charm: ch:neutron-openvswitch
|
||||||
@@ -153,7 +153,7 @@ applications:
|
|||||||
prevent-arp-spoofing: False
|
prevent-arp-spoofing: False
|
||||||
firewall-driver: openvswitch
|
firewall-driver: openvswitch
|
||||||
bridge-mappings: physnet1:br-ex
|
bridge-mappings: physnet1:br-ex
|
||||||
channel: yoga/edge
|
channel: latest/edge
|
||||||
neutron-openvswitch-octavia:
|
neutron-openvswitch-octavia:
|
||||||
series: *series
|
series: *series
|
||||||
charm: ch:neutron-openvswitch
|
charm: ch:neutron-openvswitch
|
||||||
@@ -162,7 +162,7 @@ applications:
|
|||||||
debug: True
|
debug: True
|
||||||
prevent-arp-spoofing: False
|
prevent-arp-spoofing: False
|
||||||
firewall-driver: openvswitch
|
firewall-driver: openvswitch
|
||||||
channel: yoga/edge
|
channel: latest/edge
|
||||||
nova-cloud-controller:
|
nova-cloud-controller:
|
||||||
constraints: mem=7168M
|
constraints: mem=7168M
|
||||||
charm: ch:nova-cloud-controller
|
charm: ch:nova-cloud-controller
|
||||||
@@ -171,7 +171,7 @@ applications:
|
|||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
debug: True
|
debug: True
|
||||||
network-manager: Neutron
|
network-manager: Neutron
|
||||||
channel: yoga/edge
|
channel: latest/edge
|
||||||
nova-compute:
|
nova-compute:
|
||||||
constraints: mem=7168M
|
constraints: mem=7168M
|
||||||
charm: ch:nova-compute
|
charm: ch:nova-compute
|
||||||
@@ -179,15 +179,15 @@ applications:
|
|||||||
options:
|
options:
|
||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
debug: True
|
debug: True
|
||||||
channel: yoga/edge
|
channel: latest/edge
|
||||||
hacluster-octavia:
|
hacluster-octavia:
|
||||||
charm: ch:hacluster
|
charm: ch:hacluster
|
||||||
num_units: 0
|
num_units: 0
|
||||||
channel: 2.0.3/edge
|
channel: latest/edge
|
||||||
octavia:
|
octavia:
|
||||||
constraints: cores=8
|
constraints: cores=8
|
||||||
series: *series
|
series: *series
|
||||||
charm: ../../../octavia_ubuntu-20.04-amd64.charm
|
charm: ../../../octavia_ubuntu-22.04-amd64_ubuntu-22.10-amd64.charm
|
||||||
num_units: 3
|
num_units: 3
|
||||||
options:
|
options:
|
||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
@@ -197,7 +197,7 @@ applications:
|
|||||||
rabbitmq-server:
|
rabbitmq-server:
|
||||||
charm: ch:rabbitmq-server
|
charm: ch:rabbitmq-server
|
||||||
num_units: 1
|
num_units: 1
|
||||||
channel: 3.8/edge
|
channel: latest/edge
|
||||||
glance-simplestreams-sync:
|
glance-simplestreams-sync:
|
||||||
charm: ch:glance-simplestreams-sync
|
charm: ch:glance-simplestreams-sync
|
||||||
num_units: 1
|
num_units: 1
|
||||||
@@ -207,17 +207,16 @@ applications:
|
|||||||
name_prefix: 'ubuntu:released',
|
name_prefix: 'ubuntu:released',
|
||||||
path: 'streams/v1/index.sjson', max: 1,
|
path: 'streams/v1/index.sjson', max: 1,
|
||||||
item_filters: [
|
item_filters: [
|
||||||
'release~(focal)',
|
'release~(kinetic)',
|
||||||
'arch~(x86_64|amd64)',
|
'arch~(x86_64|amd64)',
|
||||||
'ftype~(disk1.img|disk.img)']}]"
|
'ftype~(disk1.img|disk.img)']}]"
|
||||||
channel: yoga/edge
|
channel: latest/edge
|
||||||
octavia-diskimage-retrofit:
|
octavia-diskimage-retrofit:
|
||||||
charm: ch:octavia-diskimage-retrofit
|
charm: ch:octavia-diskimage-retrofit
|
||||||
options:
|
options:
|
||||||
amp-image-tag: 'octavia-amphora'
|
amp-image-tag: 'octavia-amphora'
|
||||||
retrofit-series: *series
|
retrofit-series: *series
|
||||||
retrofit-uca-pocket: yoga
|
channel: latest/edge
|
||||||
channel: yoga/edge
|
|
||||||
placement:
|
placement:
|
||||||
charm: ch:placement
|
charm: ch:placement
|
||||||
num_units: 1
|
num_units: 1
|
||||||
@@ -225,8 +224,8 @@ applications:
|
|||||||
options:
|
options:
|
||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
debug: true
|
debug: true
|
||||||
channel: yoga/edge
|
channel: latest/edge
|
||||||
vault:
|
vault:
|
||||||
charm: ch:vault
|
charm: ch:vault
|
||||||
num_units: 1
|
num_units: 1
|
||||||
channel: 1.7/edge
|
channel: latest/edge
|
||||||
@@ -1 +0,0 @@
|
|||||||
local-charm-overlay.yaml.j2
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
local-charm-overlay.yaml.j2
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
local-charm-overlay.yaml.j2
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
local-charm-overlay.yaml.j2
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
local-charm-overlay.yaml.j2
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
local-charm-overlay.yaml.j2
|
|
||||||
@@ -1,18 +1,20 @@
|
|||||||
charm_name: octavia
|
charm_name: octavia
|
||||||
|
|
||||||
gate_bundles:
|
gate_bundles:
|
||||||
- focal-xena-ha-ovn
|
|
||||||
- focal-xena-ha
|
|
||||||
|
|
||||||
smoke_bundles:
|
|
||||||
- focal-xena-ha
|
|
||||||
|
|
||||||
dev_bundles:
|
|
||||||
- focal-yoga-ha-ovn
|
|
||||||
- focal-yoga-ha
|
|
||||||
- jammy-yoga-ha-ovn
|
- jammy-yoga-ha-ovn
|
||||||
- jammy-yoga-ha
|
- jammy-yoga-ha
|
||||||
|
|
||||||
|
smoke_bundles:
|
||||||
|
- jammy-yoga-ha
|
||||||
|
|
||||||
|
dev_bundles:
|
||||||
|
- jammy-yoga-ha-ovn
|
||||||
|
- jammy-yoga-ha
|
||||||
|
- jammy-zed-ha-ovn
|
||||||
|
- jammy-zed-ha
|
||||||
|
- kinetic-zed-ha-ovn
|
||||||
|
- kinetic-zed-ha
|
||||||
|
|
||||||
|
|
||||||
comment: |
|
comment: |
|
||||||
The `bionic-rocky-lxd` bundle currently fails due to a bug in LXD.
|
The `bionic-rocky-lxd` bundle currently fails due to a bug in LXD.
|
||||||
@@ -72,5 +74,5 @@ tests_options:
|
|||||||
policyd:
|
policyd:
|
||||||
service: octavia
|
service: octavia
|
||||||
force_deploy:
|
force_deploy:
|
||||||
- jammy-yoga-ha-ovn
|
- kinetic-zed-ha-ovn
|
||||||
- jammy-yoga-ha
|
- kinetic-zed-ha
|
||||||
|
|||||||
@@ -4,7 +4,6 @@
|
|||||||
# https://github.com/openstack-charmers/release-tools
|
# https://github.com/openstack-charmers/release-tools
|
||||||
#
|
#
|
||||||
pyparsing<3.0.0 # aodhclient is pinned in zaza and needs pyparsing < 3.0.0, but cffi also needs it, so pin here.
|
pyparsing<3.0.0 # aodhclient is pinned in zaza and needs pyparsing < 3.0.0, but cffi also needs it, so pin here.
|
||||||
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
|
||||||
|
|
||||||
stestr>=2.2.0
|
stestr>=2.2.0
|
||||||
@@ -13,25 +12,10 @@ stestr>=2.2.0
|
|||||||
# https://github.com/mtreinish/stestr/issues/145
|
# https://github.com/mtreinish/stestr/issues/145
|
||||||
cliff<3.0.0
|
cliff<3.0.0
|
||||||
|
|
||||||
# Dependencies of stestr. Newer versions use keywords that didn't exist in
|
|
||||||
# python 3.5 yet (e.g. "ModuleNotFoundError")
|
|
||||||
importlib-metadata<3.0.0; python_version < '3.6'
|
|
||||||
importlib-resources<3.0.0; python_version < '3.6'
|
|
||||||
|
|
||||||
# Some Zuul nodes sometimes pull newer versions of these dependencies which
|
|
||||||
# dropped support for python 3.5:
|
|
||||||
osprofiler<2.7.0;python_version<'3.6'
|
|
||||||
stevedore<1.31.0;python_version<'3.6'
|
|
||||||
debtcollector<1.22.0;python_version<'3.6'
|
|
||||||
oslo.utils<=3.41.0;python_version<'3.6'
|
|
||||||
|
|
||||||
requests>=2.18.4
|
requests>=2.18.4
|
||||||
charms.reactive
|
charms.reactive
|
||||||
|
|
||||||
# Newer mock seems to have some syntax which is newer than python3.5 (e.g.
|
mock>=1.2
|
||||||
# f'{something}'
|
|
||||||
mock>=1.2,<4.0.0; python_version < '3.6'
|
|
||||||
mock>=1.2; python_version >= '3.6'
|
|
||||||
|
|
||||||
nose>=1.3.7
|
nose>=1.3.7
|
||||||
coverage>=3.6
|
coverage>=3.6
|
||||||
@@ -52,3 +36,4 @@ cryptography<3.4 # vault, keystone-saml-mellon
|
|||||||
lxml # keystone-saml-mellon
|
lxml # keystone-saml-mellon
|
||||||
hvac # vault, barbican-vault
|
hvac # vault, barbican-vault
|
||||||
psutil # cinder-lvm
|
psutil # cinder-lvm
|
||||||
|
pyopenssl<=22.0.0
|
||||||
|
|||||||
28
tox.ini
28
tox.ini
@@ -19,10 +19,8 @@ minversion = 3.18.0
|
|||||||
setenv = VIRTUAL_ENV={envdir}
|
setenv = VIRTUAL_ENV={envdir}
|
||||||
PYTHONHASHSEED=0
|
PYTHONHASHSEED=0
|
||||||
TERM=linux
|
TERM=linux
|
||||||
LAYER_PATH={toxinidir}/layers
|
|
||||||
INTERFACE_PATH={toxinidir}/interfaces
|
|
||||||
JUJU_REPOSITORY={toxinidir}/build
|
JUJU_REPOSITORY={toxinidir}/build
|
||||||
passenv = http_proxy https_proxy INTERFACE_PATH LAYER_PATH JUJU_REPOSITORY
|
passenv = no_proxy http_proxy https_proxy JUJU_REPOSITORY
|
||||||
install_command =
|
install_command =
|
||||||
{toxinidir}/pip.sh install {opts} {packages}
|
{toxinidir}/pip.sh install {opts} {packages}
|
||||||
allowlist_externals =
|
allowlist_externals =
|
||||||
@@ -54,28 +52,8 @@ 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]
|
[testenv:py310]
|
||||||
basepython = python3.5
|
basepython = python3.10
|
||||||
deps = -r{toxinidir}/test-requirements.txt
|
|
||||||
commands = stestr run --slowest {posargs}
|
|
||||||
|
|
||||||
[testenv:py37]
|
|
||||||
basepython = python3.7
|
|
||||||
deps = -r{toxinidir}/test-requirements.txt
|
|
||||||
commands = stestr run --slowest {posargs}
|
|
||||||
|
|
||||||
[testenv:py36]
|
|
||||||
basepython = python3.6
|
|
||||||
deps = -r{toxinidir}/test-requirements.txt
|
|
||||||
commands = stestr run --slowest {posargs}
|
|
||||||
|
|
||||||
[testenv:py38]
|
|
||||||
basepython = python3.8
|
|
||||||
deps = -r{toxinidir}/test-requirements.txt
|
|
||||||
commands = stestr run --slowest {posargs}
|
|
||||||
|
|
||||||
[testenv:py39]
|
|
||||||
basepython = python3.9
|
|
||||||
deps = -r{toxinidir}/test-requirements.txt
|
deps = -r{toxinidir}/test-requirements.txt
|
||||||
commands = stestr run --slowest {posargs}
|
commands = stestr run --slowest {posargs}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user