Update to build using charmcraft - xena batch
Batch to add building by charmcraft for the xena batch. Supports just wallaby and xena in gate. Change-Id: I0d05106fb2694bc53af9b2be405be39fa7406118
This commit is contained in:
parent
cbb1a6754d
commit
41a37ca8dc
|
@ -6,3 +6,4 @@ build
|
||||||
src/tests/bundles/overlays/local-charm-overlay.yaml.j2
|
src/tests/bundles/overlays/local-charm-overlay.yaml.j2
|
||||||
interfaces
|
interfaces
|
||||||
layers
|
layers
|
||||||
|
*.charm
|
||||||
|
|
|
@ -3,4 +3,4 @@ host=review.opendev.org
|
||||||
port=29418
|
port=29418
|
||||||
project=openstack/charm-keystone-saml-mellon.git
|
project=openstack/charm-keystone-saml-mellon.git
|
||||||
|
|
||||||
defaultbranch=stable/21.10
|
defaultbranch=stable/xena
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
- project:
|
- project:
|
||||||
templates:
|
templates:
|
||||||
- python35-charm-jobs
|
- openstack-python3-xena-jobs
|
||||||
- openstack-python3-train-jobs
|
- openstack-cover-jobs
|
||||||
|
|
|
@ -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.
|
|
@ -0,0 +1,32 @@
|
||||||
|
type: charm
|
||||||
|
|
||||||
|
parts:
|
||||||
|
charm:
|
||||||
|
build-packages:
|
||||||
|
- tox
|
||||||
|
- git
|
||||||
|
- python3-dev
|
||||||
|
override-build: |
|
||||||
|
apt-get install ca-certificates -y
|
||||||
|
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: "20.04"
|
||||||
|
architectures:
|
||||||
|
- amd64
|
||||||
|
- s390x
|
||||||
|
- ppc64el
|
||||||
|
- arm64
|
||||||
|
run-on:
|
||||||
|
- name: ubuntu
|
||||||
|
channel: "20.04"
|
|
@ -0,0 +1 @@
|
||||||
|
src/metadata.yaml
|
46
osci.yaml
46
osci.yaml
|
@ -1,50 +1,30 @@
|
||||||
- project:
|
- project:
|
||||||
templates:
|
templates:
|
||||||
- charm-unit-jobs
|
- charm-unit-jobs-py38
|
||||||
check:
|
check:
|
||||||
jobs:
|
jobs:
|
||||||
- bionic-queens-ha_keystone-saml-mellon
|
|
||||||
- focal-ussuri-ha_keystone-saml-mellon
|
|
||||||
- focal-victoria-ha_keystone-saml-mellon
|
|
||||||
- focal-wallaby-ha_keystone-saml-mellon
|
- focal-wallaby-ha_keystone-saml-mellon
|
||||||
- hirsute-wallaby-ha_keystone-saml-mellon
|
- focal-xena-ha_keystone-saml-mellon
|
||||||
vars:
|
vars:
|
||||||
needs_charm_build: true
|
needs_charm_build: true
|
||||||
charm_build_name: keystone-saml-mellon
|
charm_build_name: keystone-saml-mellon
|
||||||
|
build_type: charmcraft
|
||||||
|
|
||||||
- job:
|
|
||||||
name: bionic-queens-ha_keystone-saml-mellon
|
|
||||||
parent: func-target
|
|
||||||
dependencies:
|
|
||||||
- osci-lint
|
|
||||||
- tox-py35
|
|
||||||
- tox-py36
|
|
||||||
- tox-py37
|
|
||||||
- tox-py38
|
|
||||||
vars:
|
|
||||||
tox_extra_args: bionic-queens-ha
|
|
||||||
- job:
|
|
||||||
name: focal-ussuri-ha_keystone-saml-mellon
|
|
||||||
parent: func-target
|
|
||||||
dependencies: &smoke-jobs
|
|
||||||
- bionic-queens-ha_keystone-saml-mellon
|
|
||||||
vars:
|
|
||||||
tox_extra_args: focal-ussuri-ha
|
|
||||||
- job:
|
|
||||||
name: focal-victoria-ha_keystone-saml-mellon
|
|
||||||
parent: func-target
|
|
||||||
dependencies: *smoke-jobs
|
|
||||||
vars:
|
|
||||||
tox_extra_args: focal-victoria-ha
|
|
||||||
- job:
|
- job:
|
||||||
name: focal-wallaby-ha_keystone-saml-mellon
|
name: focal-wallaby-ha_keystone-saml-mellon
|
||||||
parent: func-target
|
parent: func-target
|
||||||
dependencies: *smoke-jobs
|
dependencies:
|
||||||
|
- charm-build
|
||||||
|
- osci-lint
|
||||||
|
- tox-py38
|
||||||
vars:
|
vars:
|
||||||
tox_extra_args: focal-wallaby-ha
|
tox_extra_args: focal-wallaby-ha
|
||||||
- job:
|
- job:
|
||||||
name: hirsute-wallaby-ha_keystone-saml-mellon
|
name: focal-xena-ha_keystone-saml-mellon
|
||||||
parent: func-target
|
parent: func-target
|
||||||
dependencies: *smoke-jobs
|
dependencies:
|
||||||
|
- charm-build
|
||||||
|
- osci-lint
|
||||||
|
- tox-py38
|
||||||
vars:
|
vars:
|
||||||
tox_extra_args: hirsute-wallaby-ha
|
tox_extra_args: focal-xena-ha
|
||||||
|
|
|
@ -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
|
||||||
|
|
||||||
|
|
|
@ -150,17 +150,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/xena",
|
||||||
"version": "10627ee5f991c268f174d6d100e218a0e1867af1",
|
"version": "10627ee5f991c268f174d6d100e218a0e1867af1",
|
||||||
"vcs": "git"
|
"vcs": "git"
|
||||||
},
|
},
|
||||||
|
@ -180,8 +174,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/xena",
|
||||||
"version": "26efcd0da51d580f68ead2ca13c38f58766f8a14",
|
"version": "63229d2ba725e773d9a0dfc97f10643b89a7f7ac",
|
||||||
"vcs": "git"
|
"vcs": "git"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -209,4 +203,4 @@
|
||||||
"version": "21.10.1"
|
"version": "21.10.1"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
|
@ -20,12 +20,7 @@ tags:
|
||||||
- federation
|
- federation
|
||||||
- idP
|
- idP
|
||||||
series:
|
series:
|
||||||
- xenial
|
|
||||||
- bionic
|
|
||||||
- focal
|
- focal
|
||||||
- groovy
|
|
||||||
- hirsute
|
|
||||||
- impish
|
|
||||||
provides:
|
provides:
|
||||||
keystone-fid-service-provider:
|
keystone-fid-service-provider:
|
||||||
interface: keystone-fid-service-provider
|
interface: keystone-fid-service-provider
|
||||||
|
|
|
@ -4,6 +4,9 @@
|
||||||
# https://github.com/openstack-charmers/release-tools
|
# https://github.com/openstack-charmers/release-tools
|
||||||
#
|
#
|
||||||
|
|
||||||
|
# Need tox to be available from tox... inception yes, but its a workaround for now
|
||||||
|
tox
|
||||||
|
|
||||||
# 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/xena#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/xena#egg=zaza.openstack
|
||||||
|
|
|
@ -1,184 +0,0 @@
|
||||||
relations:
|
|
||||||
- - nova-compute:amqp
|
|
||||||
- rabbitmq-server:amqp
|
|
||||||
- - neutron-gateway: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
|
|
||||||
- - neutron-gateway:neutron-plugin-api
|
|
||||||
- neutron-api:neutron-plugin-api
|
|
||||||
- - 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-cloud-controller:quantum-network-service
|
|
||||||
- neutron-gateway:quantum-network-service
|
|
||||||
- - nova-compute:neutron-plugin
|
|
||||||
- neutron-openvswitch:neutron-plugin
|
|
||||||
- - neutron-openvswitch:amqp
|
|
||||||
- rabbitmq-server:amqp
|
|
||||||
- - openstack-dashboard:identity-service
|
|
||||||
- keystone:identity-service
|
|
||||||
- - openstack-dashboard:shared-db
|
|
||||||
- mysql:shared-db
|
|
||||||
- - nova-cloud-controller:shared-db
|
|
||||||
- mysql:shared-db
|
|
||||||
- - nova-cloud-controller:neutron-api
|
|
||||||
- neutron-api:neutron-api
|
|
||||||
- - cinder:image-service
|
|
||||||
- glance:image-service
|
|
||||||
- - cinder:amqp
|
|
||||||
- rabbitmq-server:amqp
|
|
||||||
- - cinder:identity-service
|
|
||||||
- keystone:identity-service
|
|
||||||
- - cinder:cinder-volume-service
|
|
||||||
- nova-cloud-controller:cinder-volume-service
|
|
||||||
- - cinder:shared-db
|
|
||||||
- mysql:shared-db
|
|
||||||
- - ntp:juju-info
|
|
||||||
- nova-compute:juju-info
|
|
||||||
- - ntp:juju-info
|
|
||||||
- neutron-gateway:juju-info
|
|
||||||
- - keystone
|
|
||||||
- keystone-saml-mellon1
|
|
||||||
- - keystone
|
|
||||||
- keystone-saml-mellon2
|
|
||||||
- - vault:shared-db
|
|
||||||
- mysql:shared-db
|
|
||||||
- - vault:certificates
|
|
||||||
- keystone:certificates
|
|
||||||
- - vault:certificates
|
|
||||||
- glance:certificates
|
|
||||||
- - vault:certificates
|
|
||||||
- openstack-dashboard:certificates
|
|
||||||
- - openstack-dashboard
|
|
||||||
- keystone-saml-mellon1
|
|
||||||
- - openstack-dashboard
|
|
||||||
- keystone-saml-mellon2
|
|
||||||
- - keystone:websso-trusted-dashboard
|
|
||||||
- openstack-dashboard:websso-trusted-dashboard
|
|
||||||
- - vault:certificates
|
|
||||||
- cinder:certificates
|
|
||||||
- - vault:certificates
|
|
||||||
- neutron-api:certificates
|
|
||||||
- - vault:certificates
|
|
||||||
- nova-cloud-controller:certificates
|
|
||||||
|
|
||||||
series: bionic
|
|
||||||
services:
|
|
||||||
cinder:
|
|
||||||
charm: cs:~openstack-charmers/cinder
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
block-device: None
|
|
||||||
glance-api-version: 2
|
|
||||||
glance:
|
|
||||||
charm: cs:~openstack-charmers/glance
|
|
||||||
num_units: 1
|
|
||||||
keystone:
|
|
||||||
charm: cs:~openstack-charmers/keystone
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
token-provider: 'fernet'
|
|
||||||
mysql:
|
|
||||||
charm: cs:~openstack-charmers/percona-cluster
|
|
||||||
num_units: 1
|
|
||||||
constraints: mem=3072M
|
|
||||||
options:
|
|
||||||
innodb-buffer-pool-size: 256M
|
|
||||||
max-connections: 1000
|
|
||||||
neutron-api:
|
|
||||||
charm: cs:~openstack-charmers/neutron-api
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
flat-network-providers: physnet1
|
|
||||||
neutron-security-groups: true
|
|
||||||
neutron-gateway:
|
|
||||||
charm: cs:~openstack-charmers/neutron-gateway
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
bridge-mappings: physnet1:br-ex
|
|
||||||
neutron-openvswitch:
|
|
||||||
charm: cs:~openstack-charmers/neutron-openvswitch
|
|
||||||
num_units: 0
|
|
||||||
nova-cloud-controller:
|
|
||||||
charm: cs:~openstack-charmers/nova-cloud-controller
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
network-manager: Neutron
|
|
||||||
nova-compute:
|
|
||||||
charm: cs:~openstack-charmers/nova-compute
|
|
||||||
num_units: 2
|
|
||||||
options:
|
|
||||||
config-flags: default_ephemeral_format=ext4
|
|
||||||
enable-live-migration: true
|
|
||||||
enable-resize: true
|
|
||||||
migration-auth-type: ssh
|
|
||||||
ntp:
|
|
||||||
charm: cs:ntp
|
|
||||||
num_units: 0
|
|
||||||
openstack-dashboard:
|
|
||||||
charm: cs:~openstack-charmers/openstack-dashboard
|
|
||||||
num_units: 1
|
|
||||||
rabbitmq-server:
|
|
||||||
charm: cs:~openstack-charmers/rabbitmq-server
|
|
||||||
num_units: 1
|
|
||||||
vault:
|
|
||||||
num_units: 1
|
|
||||||
charm: cs:~openstack-charmers/vault
|
|
||||||
keystone-saml-mellon1:
|
|
||||||
series: bionic
|
|
||||||
charm: ../../../keystone-saml-mellon
|
|
||||||
num_units: 0
|
|
||||||
options:
|
|
||||||
idp-name: 'test-saml-idp1'
|
|
||||||
protocol-name: 'mapped'
|
|
||||||
user-facing-name: "Test SAML IDP #1"
|
|
||||||
subject-confirmation-data-address-check: False
|
|
||||||
nameid-formats: "urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress"
|
|
||||||
test-saml-idp1:
|
|
||||||
charm: cs:~ionutbalutoiu/test-saml-idp
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
idp-name: 'test-saml-idp1'
|
|
||||||
protocol-name: 'mapped'
|
|
||||||
auth-user-name: 'user1'
|
|
||||||
auth-user-password: 'userpass1'
|
|
||||||
keystone-saml-mellon2:
|
|
||||||
series: bionic
|
|
||||||
charm: ../../../keystone-saml-mellon
|
|
||||||
num_units: 0
|
|
||||||
options:
|
|
||||||
idp-name: 'test-saml-idp2'
|
|
||||||
protocol-name: 'mapped'
|
|
||||||
user-facing-name: "Test SAML IDP #2"
|
|
||||||
subject-confirmation-data-address-check: False
|
|
||||||
nameid-formats: "urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress"
|
|
||||||
test-saml-idp2:
|
|
||||||
charm: cs:~ionutbalutoiu/test-saml-idp
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
idp-name: 'test-saml-idp2'
|
|
||||||
protocol-name: 'mapped'
|
|
||||||
auth-user-name: 'user2'
|
|
||||||
auth-user-password: 'userpass2'
|
|
|
@ -1,380 +0,0 @@
|
||||||
variables:
|
|
||||||
openstack-origin: &openstack-origin cloud:focal-victoria
|
|
||||||
|
|
||||||
series: focal
|
|
||||||
|
|
||||||
comment:
|
|
||||||
- 'machines section to decide order of deployment. database sooner = faster'
|
|
||||||
machines:
|
|
||||||
'0':
|
|
||||||
constraints: mem=3072M
|
|
||||||
'1':
|
|
||||||
constraints: mem=3072M
|
|
||||||
'2':
|
|
||||||
constraints: mem=3072M
|
|
||||||
'3':
|
|
||||||
'4':
|
|
||||||
'5':
|
|
||||||
'6':
|
|
||||||
'7':
|
|
||||||
'8':
|
|
||||||
'9':
|
|
||||||
'10':
|
|
||||||
'11':
|
|
||||||
'12':
|
|
||||||
'13':
|
|
||||||
'14':
|
|
||||||
'15':
|
|
||||||
'16':
|
|
||||||
'17':
|
|
||||||
'18':
|
|
||||||
|
|
||||||
applications:
|
|
||||||
|
|
||||||
keystone-mysql-router:
|
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
|
||||||
neutron-api-mysql-router:
|
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
|
||||||
glance-mysql-router:
|
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
|
||||||
openstack-dashboard-mysql-router:
|
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
|
||||||
nova-cloud-controller-mysql-router:
|
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
|
||||||
cinder-mysql-router:
|
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
|
||||||
vault-mysql-router:
|
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
|
||||||
placement-mysql-router:
|
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
|
||||||
|
|
||||||
mysql-innodb-cluster:
|
|
||||||
charm: cs:~openstack-charmers/mysql-innodb-cluster
|
|
||||||
num_units: 3
|
|
||||||
options:
|
|
||||||
source: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '0'
|
|
||||||
- '1'
|
|
||||||
- '2'
|
|
||||||
|
|
||||||
cinder:
|
|
||||||
num_units: 1
|
|
||||||
charm: cs:~openstack-charmers/cinder
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
glance-api-version: 2
|
|
||||||
block-device: None
|
|
||||||
to:
|
|
||||||
- '3'
|
|
||||||
|
|
||||||
glance:
|
|
||||||
charm: cs:~openstack-charmers/glance
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '4'
|
|
||||||
|
|
||||||
keystone:
|
|
||||||
charm: cs:~openstack-charmers/keystone
|
|
||||||
num_units: 3
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
token-provider: 'fernet'
|
|
||||||
to:
|
|
||||||
- '5'
|
|
||||||
- '6'
|
|
||||||
- '7'
|
|
||||||
|
|
||||||
neutron-api:
|
|
||||||
charm: cs:~openstack-charmers/neutron-api
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
manage-neutron-plugin-legacy-mode: true
|
|
||||||
flat-network-providers: physnet1
|
|
||||||
neutron-security-groups: true
|
|
||||||
to:
|
|
||||||
- '8'
|
|
||||||
|
|
||||||
neutron-gateway:
|
|
||||||
charm: cs:~openstack-charmers/neutron-gateway
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
bridge-mappings: physnet1:br-ex
|
|
||||||
to:
|
|
||||||
- '9'
|
|
||||||
|
|
||||||
neutron-openvswitch:
|
|
||||||
charm: cs:~openstack-charmers/neutron-openvswitch
|
|
||||||
num_units: 0
|
|
||||||
|
|
||||||
nova-cloud-controller:
|
|
||||||
charm: cs:~openstack-charmers/nova-cloud-controller
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
network-manager: Neutron
|
|
||||||
to:
|
|
||||||
- '10'
|
|
||||||
|
|
||||||
nova-compute:
|
|
||||||
charm: cs:~openstack-charmers/nova-compute
|
|
||||||
num_units: 2
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
config-flags: default_ephemeral_format=ext4
|
|
||||||
enable-live-migration: true
|
|
||||||
enable-resize: true
|
|
||||||
migration-auth-type: ssh
|
|
||||||
to:
|
|
||||||
- '11'
|
|
||||||
- '12'
|
|
||||||
|
|
||||||
ntp:
|
|
||||||
charm: cs:ntp
|
|
||||||
num_units: 0
|
|
||||||
|
|
||||||
openstack-dashboard:
|
|
||||||
charm: cs:~openstack-charmers/openstack-dashboard
|
|
||||||
num_units: 3
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '13'
|
|
||||||
- '14'
|
|
||||||
- '15'
|
|
||||||
|
|
||||||
rabbitmq-server:
|
|
||||||
charm: cs:~openstack-charmers/rabbitmq-server
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
source: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '16'
|
|
||||||
|
|
||||||
vault:
|
|
||||||
num_units: 1
|
|
||||||
charm: cs:~openstack-charmers/vault
|
|
||||||
to:
|
|
||||||
- '17'
|
|
||||||
|
|
||||||
placement:
|
|
||||||
charm: cs:~openstack-charmers/placement
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '18'
|
|
||||||
|
|
||||||
keystone-saml-mellon1:
|
|
||||||
series: focal
|
|
||||||
charm: ../../../keystone-saml-mellon
|
|
||||||
num_units: 0
|
|
||||||
options:
|
|
||||||
idp-name: 'test-saml-idp1'
|
|
||||||
protocol-name: 'mapped'
|
|
||||||
user-facing-name: "Test SAML IDP #1"
|
|
||||||
subject-confirmation-data-address-check: False
|
|
||||||
nameid-formats: "urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress"
|
|
||||||
test-saml-idp1:
|
|
||||||
charm: cs:~ionutbalutoiu/test-saml-idp
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
idp-name: 'test-saml-idp1'
|
|
||||||
protocol-name: 'mapped'
|
|
||||||
auth-user-name: 'user1'
|
|
||||||
auth-user-password: 'userpass1'
|
|
||||||
|
|
||||||
keystone-saml-mellon2:
|
|
||||||
series: focal
|
|
||||||
charm: ../../../keystone-saml-mellon
|
|
||||||
num_units: 0
|
|
||||||
options:
|
|
||||||
idp-name: 'test-saml-idp2'
|
|
||||||
protocol-name: 'mapped'
|
|
||||||
user-facing-name: "Test SAML IDP #2"
|
|
||||||
subject-confirmation-data-address-check: False
|
|
||||||
nameid-formats: "urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress"
|
|
||||||
test-saml-idp2:
|
|
||||||
charm: cs:~ionutbalutoiu/test-saml-idp
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
idp-name: 'test-saml-idp2'
|
|
||||||
protocol-name: 'mapped'
|
|
||||||
auth-user-name: 'user2'
|
|
||||||
auth-user-password: 'userpass2'
|
|
||||||
|
|
||||||
keystone-hacluster:
|
|
||||||
charm: cs:~openstack-charmers/hacluster
|
|
||||||
num_units: 0
|
|
||||||
options:
|
|
||||||
corosync_transport: unicast
|
|
||||||
cluster_count: 3
|
|
||||||
openstack-dashboard-hacluster:
|
|
||||||
charm: cs:~openstack-charmers/hacluster
|
|
||||||
num_units: 0
|
|
||||||
options:
|
|
||||||
corosync_transport: unicast
|
|
||||||
cluster_count: 3
|
|
||||||
|
|
||||||
relations:
|
|
||||||
|
|
||||||
- - 'nova-compute:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
|
|
||||||
- - 'neutron-gateway:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
|
|
||||||
- - 'keystone:shared-db'
|
|
||||||
- 'keystone-mysql-router:shared-db'
|
|
||||||
- - 'keystone-mysql-router:db-router'
|
|
||||||
- 'mysql-innodb-cluster:db-router'
|
|
||||||
|
|
||||||
- - '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'
|
|
||||||
- 'neutron-api-mysql-router:shared-db'
|
|
||||||
- - 'neutron-api-mysql-router:db-router'
|
|
||||||
- 'mysql-innodb-cluster:db-router'
|
|
||||||
|
|
||||||
- - 'neutron-api:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
|
|
||||||
- - 'neutron-gateway:neutron-plugin-api'
|
|
||||||
- 'neutron-api:neutron-plugin-api'
|
|
||||||
|
|
||||||
- - 'glance:shared-db'
|
|
||||||
- 'glance-mysql-router:shared-db'
|
|
||||||
- - 'glance-mysql-router:db-router'
|
|
||||||
- 'mysql-innodb-cluster:db-router'
|
|
||||||
|
|
||||||
- - '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-cloud-controller:quantum-network-service'
|
|
||||||
- 'neutron-gateway:quantum-network-service'
|
|
||||||
|
|
||||||
- - 'nova-compute:neutron-plugin'
|
|
||||||
- 'neutron-openvswitch:neutron-plugin'
|
|
||||||
|
|
||||||
- - 'neutron-openvswitch:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
|
|
||||||
- - 'openstack-dashboard:identity-service'
|
|
||||||
- 'keystone:identity-service'
|
|
||||||
|
|
||||||
- - 'openstack-dashboard:shared-db'
|
|
||||||
- 'openstack-dashboard-mysql-router:shared-db'
|
|
||||||
- - 'openstack-dashboard-mysql-router:db-router'
|
|
||||||
- 'mysql-innodb-cluster:db-router'
|
|
||||||
|
|
||||||
- - 'nova-cloud-controller:shared-db'
|
|
||||||
- 'nova-cloud-controller-mysql-router:shared-db'
|
|
||||||
- - 'nova-cloud-controller-mysql-router:db-router'
|
|
||||||
- 'mysql-innodb-cluster:db-router'
|
|
||||||
|
|
||||||
- - 'nova-cloud-controller:neutron-api'
|
|
||||||
- 'neutron-api:neutron-api'
|
|
||||||
|
|
||||||
- - 'cinder:image-service'
|
|
||||||
- 'glance:image-service'
|
|
||||||
|
|
||||||
- - 'cinder:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
|
|
||||||
- - 'cinder:identity-service'
|
|
||||||
- 'keystone:identity-service'
|
|
||||||
|
|
||||||
- - 'cinder:cinder-volume-service'
|
|
||||||
- 'nova-cloud-controller:cinder-volume-service'
|
|
||||||
|
|
||||||
- - 'cinder:shared-db'
|
|
||||||
- 'cinder-mysql-router:shared-db'
|
|
||||||
- - 'cinder-mysql-router:db-router'
|
|
||||||
- 'mysql-innodb-cluster:db-router'
|
|
||||||
|
|
||||||
- - 'ntp:juju-info'
|
|
||||||
- 'nova-compute:juju-info'
|
|
||||||
|
|
||||||
- - 'ntp:juju-info'
|
|
||||||
- 'neutron-gateway:juju-info'
|
|
||||||
|
|
||||||
- - 'keystone'
|
|
||||||
- 'keystone-saml-mellon1'
|
|
||||||
- - 'keystone'
|
|
||||||
- 'keystone-saml-mellon2'
|
|
||||||
|
|
||||||
- - 'vault:shared-db'
|
|
||||||
- 'vault-mysql-router:shared-db'
|
|
||||||
- - 'vault-mysql-router:db-router'
|
|
||||||
- 'mysql-innodb-cluster:db-router'
|
|
||||||
|
|
||||||
- - 'vault:certificates'
|
|
||||||
- 'keystone:certificates'
|
|
||||||
|
|
||||||
- - 'vault:certificates'
|
|
||||||
- 'glance:certificates'
|
|
||||||
|
|
||||||
- - 'vault:certificates'
|
|
||||||
- 'openstack-dashboard:certificates'
|
|
||||||
|
|
||||||
- - 'openstack-dashboard'
|
|
||||||
- 'keystone-saml-mellon1'
|
|
||||||
- - 'openstack-dashboard'
|
|
||||||
- 'keystone-saml-mellon2'
|
|
||||||
|
|
||||||
- - 'keystone:websso-trusted-dashboard'
|
|
||||||
- 'openstack-dashboard:websso-trusted-dashboard'
|
|
||||||
|
|
||||||
- - 'vault:certificates'
|
|
||||||
- 'cinder:certificates'
|
|
||||||
|
|
||||||
- - 'vault:certificates'
|
|
||||||
- 'neutron-api:certificates'
|
|
||||||
|
|
||||||
- - 'vault:certificates'
|
|
||||||
- 'nova-cloud-controller:certificates'
|
|
||||||
|
|
||||||
- - 'placement:identity-service'
|
|
||||||
- 'keystone:identity-service'
|
|
||||||
|
|
||||||
- - 'placement:placement'
|
|
||||||
- 'nova-cloud-controller:placement'
|
|
||||||
|
|
||||||
- - 'vault:certificates'
|
|
||||||
- 'placement:certificates'
|
|
||||||
|
|
||||||
- - "placement:shared-db"
|
|
||||||
- "placement-mysql-router:shared-db"
|
|
||||||
- - "placement-mysql-router:db-router"
|
|
||||||
- "mysql-innodb-cluster:db-router"
|
|
||||||
|
|
||||||
- - "keystone:ha"
|
|
||||||
- "keystone-hacluster:ha"
|
|
||||||
- - "openstack-dashboard:ha"
|
|
||||||
- "openstack-dashboard-hacluster:ha"
|
|
|
@ -1,3 +1,5 @@
|
||||||
|
local_overlay_enabled: False
|
||||||
|
|
||||||
variables:
|
variables:
|
||||||
openstack-origin: &openstack-origin cloud:focal-wallaby
|
openstack-origin: &openstack-origin cloud:focal-wallaby
|
||||||
|
|
||||||
|
@ -32,24 +34,32 @@ machines:
|
||||||
applications:
|
applications:
|
||||||
|
|
||||||
keystone-mysql-router:
|
keystone-mysql-router:
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
charm: ch:mysql-router
|
||||||
|
channel: 8.0.19/edge
|
||||||
neutron-api-mysql-router:
|
neutron-api-mysql-router:
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
charm: ch:mysql-router
|
||||||
|
channel: 8.0.19/edge
|
||||||
glance-mysql-router:
|
glance-mysql-router:
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
charm: ch:mysql-router
|
||||||
|
channel: 8.0.19/edge
|
||||||
openstack-dashboard-mysql-router:
|
openstack-dashboard-mysql-router:
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
charm: ch:mysql-router
|
||||||
|
channel: 8.0.19/edge
|
||||||
nova-cloud-controller-mysql-router:
|
nova-cloud-controller-mysql-router:
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
charm: ch:mysql-router
|
||||||
|
channel: 8.0.19/edge
|
||||||
cinder-mysql-router:
|
cinder-mysql-router:
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
charm: ch:mysql-router
|
||||||
|
channel: 8.0.19/edge
|
||||||
vault-mysql-router:
|
vault-mysql-router:
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
charm: ch:mysql-router
|
||||||
|
channel: 8.0.19/edge
|
||||||
placement-mysql-router:
|
placement-mysql-router:
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
charm: ch:mysql-router
|
||||||
|
channel: 8.0.19/edge
|
||||||
|
|
||||||
mysql-innodb-cluster:
|
mysql-innodb-cluster:
|
||||||
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
|
||||||
|
@ -57,27 +67,30 @@ applications:
|
||||||
- '0'
|
- '0'
|
||||||
- '1'
|
- '1'
|
||||||
- '2'
|
- '2'
|
||||||
|
channel: 8.0.19/edge
|
||||||
|
|
||||||
cinder:
|
cinder:
|
||||||
num_units: 1
|
num_units: 1
|
||||||
charm: cs:~openstack-charmers/cinder
|
charm: ch:cinder
|
||||||
options:
|
options:
|
||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
glance-api-version: 2
|
glance-api-version: 2
|
||||||
block-device: None
|
block-device: None
|
||||||
to:
|
to:
|
||||||
- '3'
|
- '3'
|
||||||
|
channel: xena/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
|
||||||
to:
|
to:
|
||||||
- '4'
|
- '4'
|
||||||
|
channel: xena/edge
|
||||||
|
|
||||||
keystone:
|
keystone:
|
||||||
charm: cs:~openstack-charmers/keystone
|
charm: ch:keystone
|
||||||
num_units: 3
|
num_units: 3
|
||||||
options:
|
options:
|
||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
|
@ -86,9 +99,10 @@ applications:
|
||||||
- '5'
|
- '5'
|
||||||
- '6'
|
- '6'
|
||||||
- '7'
|
- '7'
|
||||||
|
channel: xena/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
|
||||||
|
@ -97,31 +111,35 @@ applications:
|
||||||
neutron-security-groups: true
|
neutron-security-groups: true
|
||||||
to:
|
to:
|
||||||
- '8'
|
- '8'
|
||||||
|
channel: xena/edge
|
||||||
|
|
||||||
neutron-gateway:
|
neutron-gateway:
|
||||||
charm: cs:~openstack-charmers/neutron-gateway
|
charm: ch:neutron-gateway
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
bridge-mappings: physnet1:br-ex
|
bridge-mappings: physnet1:br-ex
|
||||||
to:
|
to:
|
||||||
- '9'
|
- '9'
|
||||||
|
channel: xena/edge
|
||||||
|
|
||||||
neutron-openvswitch:
|
neutron-openvswitch:
|
||||||
charm: cs:~openstack-charmers/neutron-openvswitch
|
charm: ch:neutron-openvswitch
|
||||||
num_units: 0
|
num_units: 0
|
||||||
|
channel: xena/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
|
||||||
to:
|
to:
|
||||||
- '10'
|
- '10'
|
||||||
|
channel: xena/edge
|
||||||
|
|
||||||
nova-compute:
|
nova-compute:
|
||||||
charm: cs:~openstack-charmers/nova-compute
|
charm: ch:nova-compute
|
||||||
num_units: 2
|
num_units: 2
|
||||||
options:
|
options:
|
||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
|
@ -132,13 +150,14 @@ applications:
|
||||||
to:
|
to:
|
||||||
- '11'
|
- '11'
|
||||||
- '12'
|
- '12'
|
||||||
|
channel: xena/edge
|
||||||
|
|
||||||
ntp:
|
ntp:
|
||||||
charm: cs:ntp
|
charm: cs:ntp
|
||||||
num_units: 0
|
num_units: 0
|
||||||
|
|
||||||
openstack-dashboard:
|
openstack-dashboard:
|
||||||
charm: cs:~openstack-charmers/openstack-dashboard
|
charm: ch:openstack-dashboard
|
||||||
num_units: 3
|
num_units: 3
|
||||||
options:
|
options:
|
||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
|
@ -146,32 +165,36 @@ applications:
|
||||||
- '13'
|
- '13'
|
||||||
- '14'
|
- '14'
|
||||||
- '15'
|
- '15'
|
||||||
|
channel: xena/edge
|
||||||
|
|
||||||
rabbitmq-server:
|
rabbitmq-server:
|
||||||
charm: cs:~openstack-charmers/rabbitmq-server
|
charm: ch:rabbitmq-server
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
source: *openstack-origin
|
source: *openstack-origin
|
||||||
to:
|
to:
|
||||||
- '16'
|
- '16'
|
||||||
|
channel: 3.8/edge
|
||||||
|
|
||||||
vault:
|
vault:
|
||||||
num_units: 1
|
num_units: 1
|
||||||
charm: cs:~openstack-charmers/vault
|
charm: ch:vault
|
||||||
to:
|
to:
|
||||||
- '17'
|
- '17'
|
||||||
|
channel: 1.7/edge
|
||||||
|
|
||||||
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
|
||||||
to:
|
to:
|
||||||
- '18'
|
- '18'
|
||||||
|
channel: xena/edge
|
||||||
|
|
||||||
keystone-saml-mellon1:
|
keystone-saml-mellon1:
|
||||||
series: focal
|
series: focal
|
||||||
charm: ../../../keystone-saml-mellon
|
charm: ../../../keystone-saml-mellon.charm
|
||||||
num_units: 0
|
num_units: 0
|
||||||
options:
|
options:
|
||||||
idp-name: 'test-saml-idp1'
|
idp-name: 'test-saml-idp1'
|
||||||
|
@ -180,7 +203,9 @@ applications:
|
||||||
subject-confirmation-data-address-check: False
|
subject-confirmation-data-address-check: False
|
||||||
nameid-formats: "urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress"
|
nameid-formats: "urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress"
|
||||||
test-saml-idp1:
|
test-saml-idp1:
|
||||||
charm: cs:~ionutbalutoiu/test-saml-idp
|
# This should be group owned
|
||||||
|
charm: ch:ly-test-saml-idp
|
||||||
|
channel: beta
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
idp-name: 'test-saml-idp1'
|
idp-name: 'test-saml-idp1'
|
||||||
|
@ -190,7 +215,7 @@ applications:
|
||||||
|
|
||||||
keystone-saml-mellon2:
|
keystone-saml-mellon2:
|
||||||
series: focal
|
series: focal
|
||||||
charm: ../../../keystone-saml-mellon
|
charm: ../../../keystone-saml-mellon.charm
|
||||||
num_units: 0
|
num_units: 0
|
||||||
options:
|
options:
|
||||||
idp-name: 'test-saml-idp2'
|
idp-name: 'test-saml-idp2'
|
||||||
|
@ -199,7 +224,9 @@ applications:
|
||||||
subject-confirmation-data-address-check: False
|
subject-confirmation-data-address-check: False
|
||||||
nameid-formats: "urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress"
|
nameid-formats: "urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress"
|
||||||
test-saml-idp2:
|
test-saml-idp2:
|
||||||
charm: cs:~ionutbalutoiu/test-saml-idp
|
# This should be group owned
|
||||||
|
charm: ch:ly-test-saml-idp
|
||||||
|
channel: beta
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
idp-name: 'test-saml-idp2'
|
idp-name: 'test-saml-idp2'
|
||||||
|
@ -208,17 +235,19 @@ applications:
|
||||||
auth-user-password: 'userpass2'
|
auth-user-password: 'userpass2'
|
||||||
|
|
||||||
keystone-hacluster:
|
keystone-hacluster:
|
||||||
charm: cs:~openstack-charmers/hacluster
|
charm: ch:hacluster
|
||||||
num_units: 0
|
num_units: 0
|
||||||
options:
|
options:
|
||||||
corosync_transport: unicast
|
corosync_transport: unicast
|
||||||
cluster_count: 3
|
cluster_count: 3
|
||||||
|
channel: 2.0.3/edge
|
||||||
openstack-dashboard-hacluster:
|
openstack-dashboard-hacluster:
|
||||||
charm: cs:~openstack-charmers/hacluster
|
charm: ch:hacluster
|
||||||
num_units: 0
|
num_units: 0
|
||||||
options:
|
options:
|
||||||
corosync_transport: unicast
|
corosync_transport: unicast
|
||||||
cluster_count: 3
|
cluster_count: 3
|
||||||
|
channel: 2.0.3/edge
|
||||||
|
|
||||||
relations:
|
relations:
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,7 @@
|
||||||
|
local_overlay_enabled: False
|
||||||
|
|
||||||
variables:
|
variables:
|
||||||
openstack-origin: &openstack-origin distro
|
openstack-origin: &openstack-origin cloud:focal-xena
|
||||||
|
|
||||||
series: focal
|
series: focal
|
||||||
|
|
||||||
|
@ -32,24 +34,32 @@ machines:
|
||||||
applications:
|
applications:
|
||||||
|
|
||||||
keystone-mysql-router:
|
keystone-mysql-router:
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
charm: ch:mysql-router
|
||||||
|
channel: 8.0.19/edge
|
||||||
neutron-api-mysql-router:
|
neutron-api-mysql-router:
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
charm: ch:mysql-router
|
||||||
|
channel: 8.0.19/edge
|
||||||
glance-mysql-router:
|
glance-mysql-router:
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
charm: ch:mysql-router
|
||||||
|
channel: 8.0.19/edge
|
||||||
openstack-dashboard-mysql-router:
|
openstack-dashboard-mysql-router:
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
charm: ch:mysql-router
|
||||||
|
channel: 8.0.19/edge
|
||||||
nova-cloud-controller-mysql-router:
|
nova-cloud-controller-mysql-router:
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
charm: ch:mysql-router
|
||||||
|
channel: 8.0.19/edge
|
||||||
cinder-mysql-router:
|
cinder-mysql-router:
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
charm: ch:mysql-router
|
||||||
|
channel: 8.0.19/edge
|
||||||
vault-mysql-router:
|
vault-mysql-router:
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
charm: ch:mysql-router
|
||||||
|
channel: 8.0.19/edge
|
||||||
placement-mysql-router:
|
placement-mysql-router:
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
charm: ch:mysql-router
|
||||||
|
channel: 8.0.19/edge
|
||||||
|
|
||||||
mysql-innodb-cluster:
|
mysql-innodb-cluster:
|
||||||
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
|
||||||
|
@ -57,27 +67,30 @@ applications:
|
||||||
- '0'
|
- '0'
|
||||||
- '1'
|
- '1'
|
||||||
- '2'
|
- '2'
|
||||||
|
channel: 8.0.19/edge
|
||||||
|
|
||||||
cinder:
|
cinder:
|
||||||
num_units: 1
|
num_units: 1
|
||||||
charm: cs:~openstack-charmers/cinder
|
charm: ch:cinder
|
||||||
options:
|
options:
|
||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
glance-api-version: 2
|
glance-api-version: 2
|
||||||
block-device: None
|
block-device: None
|
||||||
to:
|
to:
|
||||||
- '3'
|
- '3'
|
||||||
|
channel: xena/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
|
||||||
to:
|
to:
|
||||||
- '4'
|
- '4'
|
||||||
|
channel: xena/edge
|
||||||
|
|
||||||
keystone:
|
keystone:
|
||||||
charm: cs:~openstack-charmers/keystone
|
charm: ch:keystone
|
||||||
num_units: 3
|
num_units: 3
|
||||||
options:
|
options:
|
||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
|
@ -86,9 +99,10 @@ applications:
|
||||||
- '5'
|
- '5'
|
||||||
- '6'
|
- '6'
|
||||||
- '7'
|
- '7'
|
||||||
|
channel: xena/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
|
||||||
|
@ -97,31 +111,35 @@ applications:
|
||||||
neutron-security-groups: true
|
neutron-security-groups: true
|
||||||
to:
|
to:
|
||||||
- '8'
|
- '8'
|
||||||
|
channel: xena/edge
|
||||||
|
|
||||||
neutron-gateway:
|
neutron-gateway:
|
||||||
charm: cs:~openstack-charmers/neutron-gateway
|
charm: ch:neutron-gateway
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
bridge-mappings: physnet1:br-ex
|
bridge-mappings: physnet1:br-ex
|
||||||
to:
|
to:
|
||||||
- '9'
|
- '9'
|
||||||
|
channel: xena/edge
|
||||||
|
|
||||||
neutron-openvswitch:
|
neutron-openvswitch:
|
||||||
charm: cs:~openstack-charmers/neutron-openvswitch
|
charm: ch:neutron-openvswitch
|
||||||
num_units: 0
|
num_units: 0
|
||||||
|
channel: xena/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
|
||||||
to:
|
to:
|
||||||
- '10'
|
- '10'
|
||||||
|
channel: xena/edge
|
||||||
|
|
||||||
nova-compute:
|
nova-compute:
|
||||||
charm: cs:~openstack-charmers/nova-compute
|
charm: ch:nova-compute
|
||||||
num_units: 2
|
num_units: 2
|
||||||
options:
|
options:
|
||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
|
@ -132,13 +150,14 @@ applications:
|
||||||
to:
|
to:
|
||||||
- '11'
|
- '11'
|
||||||
- '12'
|
- '12'
|
||||||
|
channel: xena/edge
|
||||||
|
|
||||||
ntp:
|
ntp:
|
||||||
charm: cs:ntp
|
charm: cs:ntp
|
||||||
num_units: 0
|
num_units: 0
|
||||||
|
|
||||||
openstack-dashboard:
|
openstack-dashboard:
|
||||||
charm: cs:~openstack-charmers/openstack-dashboard
|
charm: ch:openstack-dashboard
|
||||||
num_units: 3
|
num_units: 3
|
||||||
options:
|
options:
|
||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
|
@ -146,32 +165,36 @@ applications:
|
||||||
- '13'
|
- '13'
|
||||||
- '14'
|
- '14'
|
||||||
- '15'
|
- '15'
|
||||||
|
channel: xena/edge
|
||||||
|
|
||||||
rabbitmq-server:
|
rabbitmq-server:
|
||||||
charm: cs:~openstack-charmers/rabbitmq-server
|
charm: ch:rabbitmq-server
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
source: *openstack-origin
|
source: *openstack-origin
|
||||||
to:
|
to:
|
||||||
- '16'
|
- '16'
|
||||||
|
channel: 3.8/edge
|
||||||
|
|
||||||
vault:
|
vault:
|
||||||
num_units: 1
|
num_units: 1
|
||||||
charm: cs:~openstack-charmers/vault
|
charm: ch:vault
|
||||||
to:
|
to:
|
||||||
- '17'
|
- '17'
|
||||||
|
channel: 1.7/edge
|
||||||
|
|
||||||
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
|
||||||
to:
|
to:
|
||||||
- '18'
|
- '18'
|
||||||
|
channel: xena/edge
|
||||||
|
|
||||||
keystone-saml-mellon1:
|
keystone-saml-mellon1:
|
||||||
series: focal
|
series: focal
|
||||||
charm: ../../../keystone-saml-mellon
|
charm: ../../../keystone-saml-mellon.charm
|
||||||
num_units: 0
|
num_units: 0
|
||||||
options:
|
options:
|
||||||
idp-name: 'test-saml-idp1'
|
idp-name: 'test-saml-idp1'
|
||||||
|
@ -180,7 +203,9 @@ applications:
|
||||||
subject-confirmation-data-address-check: False
|
subject-confirmation-data-address-check: False
|
||||||
nameid-formats: "urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress"
|
nameid-formats: "urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress"
|
||||||
test-saml-idp1:
|
test-saml-idp1:
|
||||||
charm: cs:~ionutbalutoiu/test-saml-idp
|
# This should be group owned
|
||||||
|
charm: ch:ly-test-saml-idp
|
||||||
|
channel: beta
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
idp-name: 'test-saml-idp1'
|
idp-name: 'test-saml-idp1'
|
||||||
|
@ -190,7 +215,7 @@ applications:
|
||||||
|
|
||||||
keystone-saml-mellon2:
|
keystone-saml-mellon2:
|
||||||
series: focal
|
series: focal
|
||||||
charm: ../../../keystone-saml-mellon
|
charm: ../../../keystone-saml-mellon.charm
|
||||||
num_units: 0
|
num_units: 0
|
||||||
options:
|
options:
|
||||||
idp-name: 'test-saml-idp2'
|
idp-name: 'test-saml-idp2'
|
||||||
|
@ -199,7 +224,9 @@ applications:
|
||||||
subject-confirmation-data-address-check: False
|
subject-confirmation-data-address-check: False
|
||||||
nameid-formats: "urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress"
|
nameid-formats: "urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress"
|
||||||
test-saml-idp2:
|
test-saml-idp2:
|
||||||
charm: cs:~ionutbalutoiu/test-saml-idp
|
# This should be group owned
|
||||||
|
charm: ch:ly-test-saml-idp
|
||||||
|
channel: beta
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
idp-name: 'test-saml-idp2'
|
idp-name: 'test-saml-idp2'
|
||||||
|
@ -208,17 +235,19 @@ applications:
|
||||||
auth-user-password: 'userpass2'
|
auth-user-password: 'userpass2'
|
||||||
|
|
||||||
keystone-hacluster:
|
keystone-hacluster:
|
||||||
charm: cs:~openstack-charmers/hacluster
|
charm: ch:hacluster
|
||||||
num_units: 0
|
num_units: 0
|
||||||
options:
|
options:
|
||||||
corosync_transport: unicast
|
corosync_transport: unicast
|
||||||
cluster_count: 3
|
cluster_count: 3
|
||||||
|
channel: 2.0.3/edge
|
||||||
openstack-dashboard-hacluster:
|
openstack-dashboard-hacluster:
|
||||||
charm: cs:~openstack-charmers/hacluster
|
charm: ch:hacluster
|
||||||
num_units: 0
|
num_units: 0
|
||||||
options:
|
options:
|
||||||
corosync_transport: unicast
|
corosync_transport: unicast
|
||||||
cluster_count: 3
|
cluster_count: 3
|
||||||
|
channel: 2.0.3/edge
|
||||||
|
|
||||||
relations:
|
relations:
|
||||||
|
|
|
@ -1,370 +0,0 @@
|
||||||
variables:
|
|
||||||
openstack-origin: &openstack-origin distro
|
|
||||||
|
|
||||||
series: groovy
|
|
||||||
|
|
||||||
comment:
|
|
||||||
- 'machines section to decide order of deployment. database sooner = faster'
|
|
||||||
machines:
|
|
||||||
'0':
|
|
||||||
constraints: mem=3072M
|
|
||||||
'1':
|
|
||||||
constraints: mem=3072M
|
|
||||||
'2':
|
|
||||||
constraints: mem=3072M
|
|
||||||
'3':
|
|
||||||
'4':
|
|
||||||
'5':
|
|
||||||
'6':
|
|
||||||
'7':
|
|
||||||
'8':
|
|
||||||
'9':
|
|
||||||
'10':
|
|
||||||
'11':
|
|
||||||
'12':
|
|
||||||
'13':
|
|
||||||
'14':
|
|
||||||
'15':
|
|
||||||
'16':
|
|
||||||
'17':
|
|
||||||
'18':
|
|
||||||
|
|
||||||
applications:
|
|
||||||
|
|
||||||
keystone-mysql-router:
|
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
|
||||||
neutron-api-mysql-router:
|
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
|
||||||
glance-mysql-router:
|
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
|
||||||
openstack-dashboard-mysql-router:
|
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
|
||||||
nova-cloud-controller-mysql-router:
|
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
|
||||||
cinder-mysql-router:
|
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
|
||||||
vault-mysql-router:
|
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
|
||||||
placement-mysql-router:
|
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
|
||||||
|
|
||||||
mysql-innodb-cluster:
|
|
||||||
charm: cs:~openstack-charmers/mysql-innodb-cluster
|
|
||||||
num_units: 3
|
|
||||||
options:
|
|
||||||
source: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '0'
|
|
||||||
- '1'
|
|
||||||
- '2'
|
|
||||||
|
|
||||||
cinder:
|
|
||||||
num_units: 1
|
|
||||||
charm: cs:~openstack-charmers/cinder
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
glance-api-version: 2
|
|
||||||
block-device: None
|
|
||||||
to:
|
|
||||||
- '3'
|
|
||||||
|
|
||||||
glance:
|
|
||||||
charm: cs:~openstack-charmers/glance
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '4'
|
|
||||||
|
|
||||||
keystone:
|
|
||||||
charm: cs:~openstack-charmers/keystone
|
|
||||||
num_units: 3
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
token-provider: 'fernet'
|
|
||||||
to:
|
|
||||||
- '5'
|
|
||||||
- '6'
|
|
||||||
- '7'
|
|
||||||
|
|
||||||
neutron-api:
|
|
||||||
charm: cs:~openstack-charmers/neutron-api
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
manage-neutron-plugin-legacy-mode: true
|
|
||||||
flat-network-providers: physnet1
|
|
||||||
neutron-security-groups: true
|
|
||||||
to:
|
|
||||||
- '8'
|
|
||||||
|
|
||||||
neutron-gateway:
|
|
||||||
charm: cs:~openstack-charmers/neutron-gateway
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
bridge-mappings: physnet1:br-ex
|
|
||||||
to:
|
|
||||||
- '9'
|
|
||||||
|
|
||||||
neutron-openvswitch:
|
|
||||||
charm: cs:~openstack-charmers/neutron-openvswitch
|
|
||||||
num_units: 0
|
|
||||||
|
|
||||||
nova-cloud-controller:
|
|
||||||
charm: cs:~openstack-charmers/nova-cloud-controller
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
network-manager: Neutron
|
|
||||||
to:
|
|
||||||
- '10'
|
|
||||||
|
|
||||||
nova-compute:
|
|
||||||
charm: cs:~openstack-charmers/nova-compute
|
|
||||||
num_units: 2
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
config-flags: default_ephemeral_format=ext4
|
|
||||||
enable-live-migration: true
|
|
||||||
enable-resize: true
|
|
||||||
migration-auth-type: ssh
|
|
||||||
to:
|
|
||||||
- '11'
|
|
||||||
- '12'
|
|
||||||
|
|
||||||
openstack-dashboard:
|
|
||||||
charm: cs:~openstack-charmers/openstack-dashboard
|
|
||||||
num_units: 3
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '13'
|
|
||||||
- '14'
|
|
||||||
- '15'
|
|
||||||
|
|
||||||
rabbitmq-server:
|
|
||||||
charm: cs:~openstack-charmers/rabbitmq-server
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
source: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '16'
|
|
||||||
|
|
||||||
vault:
|
|
||||||
num_units: 1
|
|
||||||
charm: cs:~openstack-charmers/vault
|
|
||||||
to:
|
|
||||||
- '17'
|
|
||||||
|
|
||||||
placement:
|
|
||||||
charm: cs:~openstack-charmers/placement
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '18'
|
|
||||||
|
|
||||||
keystone-saml-mellon1:
|
|
||||||
series: groovy
|
|
||||||
charm: ../../../keystone-saml-mellon
|
|
||||||
num_units: 0
|
|
||||||
options:
|
|
||||||
idp-name: 'test-saml-idp1'
|
|
||||||
protocol-name: 'mapped'
|
|
||||||
user-facing-name: "Test SAML IDP #1"
|
|
||||||
subject-confirmation-data-address-check: False
|
|
||||||
nameid-formats: "urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress"
|
|
||||||
test-saml-idp1:
|
|
||||||
charm: cs:~ionutbalutoiu/test-saml-idp
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
idp-name: 'test-saml-idp1'
|
|
||||||
protocol-name: 'mapped'
|
|
||||||
auth-user-name: 'user1'
|
|
||||||
auth-user-password: 'userpass1'
|
|
||||||
|
|
||||||
keystone-saml-mellon2:
|
|
||||||
series: groovy
|
|
||||||
charm: ../../../keystone-saml-mellon
|
|
||||||
num_units: 0
|
|
||||||
options:
|
|
||||||
idp-name: 'test-saml-idp2'
|
|
||||||
protocol-name: 'mapped'
|
|
||||||
user-facing-name: "Test SAML IDP #2"
|
|
||||||
subject-confirmation-data-address-check: False
|
|
||||||
nameid-formats: "urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress"
|
|
||||||
test-saml-idp2:
|
|
||||||
charm: cs:~ionutbalutoiu/test-saml-idp
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
idp-name: 'test-saml-idp2'
|
|
||||||
protocol-name: 'mapped'
|
|
||||||
auth-user-name: 'user2'
|
|
||||||
auth-user-password: 'userpass2'
|
|
||||||
|
|
||||||
keystone-hacluster:
|
|
||||||
charm: cs:~openstack-charmers/hacluster
|
|
||||||
num_units: 0
|
|
||||||
options:
|
|
||||||
corosync_transport: unicast
|
|
||||||
cluster_count: 3
|
|
||||||
openstack-dashboard-hacluster:
|
|
||||||
charm: cs:~openstack-charmers/hacluster
|
|
||||||
num_units: 0
|
|
||||||
options:
|
|
||||||
corosync_transport: unicast
|
|
||||||
cluster_count: 3
|
|
||||||
|
|
||||||
relations:
|
|
||||||
|
|
||||||
- - 'nova-compute:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
|
|
||||||
- - 'neutron-gateway:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
|
|
||||||
- - 'keystone:shared-db'
|
|
||||||
- 'keystone-mysql-router:shared-db'
|
|
||||||
- - 'keystone-mysql-router:db-router'
|
|
||||||
- 'mysql-innodb-cluster:db-router'
|
|
||||||
|
|
||||||
- - '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'
|
|
||||||
- 'neutron-api-mysql-router:shared-db'
|
|
||||||
- - 'neutron-api-mysql-router:db-router'
|
|
||||||
- 'mysql-innodb-cluster:db-router'
|
|
||||||
|
|
||||||
- - 'neutron-api:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
|
|
||||||
- - 'neutron-gateway:neutron-plugin-api'
|
|
||||||
- 'neutron-api:neutron-plugin-api'
|
|
||||||
|
|
||||||
- - 'glance:shared-db'
|
|
||||||
- 'glance-mysql-router:shared-db'
|
|
||||||
- - 'glance-mysql-router:db-router'
|
|
||||||
- 'mysql-innodb-cluster:db-router'
|
|
||||||
|
|
||||||
- - '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-cloud-controller:quantum-network-service'
|
|
||||||
- 'neutron-gateway:quantum-network-service'
|
|
||||||
|
|
||||||
- - 'nova-compute:neutron-plugin'
|
|
||||||
- 'neutron-openvswitch:neutron-plugin'
|
|
||||||
|
|
||||||
- - 'neutron-openvswitch:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
|
|
||||||
- - 'openstack-dashboard:identity-service'
|
|
||||||
- 'keystone:identity-service'
|
|
||||||
|
|
||||||
- - 'openstack-dashboard:shared-db'
|
|
||||||
- 'openstack-dashboard-mysql-router:shared-db'
|
|
||||||
- - 'openstack-dashboard-mysql-router:db-router'
|
|
||||||
- 'mysql-innodb-cluster:db-router'
|
|
||||||
|
|
||||||
- - 'nova-cloud-controller:shared-db'
|
|
||||||
- 'nova-cloud-controller-mysql-router:shared-db'
|
|
||||||
- - 'nova-cloud-controller-mysql-router:db-router'
|
|
||||||
- 'mysql-innodb-cluster:db-router'
|
|
||||||
|
|
||||||
- - 'nova-cloud-controller:neutron-api'
|
|
||||||
- 'neutron-api:neutron-api'
|
|
||||||
|
|
||||||
- - 'cinder:image-service'
|
|
||||||
- 'glance:image-service'
|
|
||||||
|
|
||||||
- - 'cinder:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
|
|
||||||
- - 'cinder:identity-service'
|
|
||||||
- 'keystone:identity-service'
|
|
||||||
|
|
||||||
- - 'cinder:cinder-volume-service'
|
|
||||||
- 'nova-cloud-controller:cinder-volume-service'
|
|
||||||
|
|
||||||
- - 'cinder:shared-db'
|
|
||||||
- 'cinder-mysql-router:shared-db'
|
|
||||||
- - 'cinder-mysql-router:db-router'
|
|
||||||
- 'mysql-innodb-cluster:db-router'
|
|
||||||
|
|
||||||
- - 'keystone'
|
|
||||||
- 'keystone-saml-mellon1'
|
|
||||||
- - 'keystone'
|
|
||||||
- 'keystone-saml-mellon2'
|
|
||||||
|
|
||||||
- - 'vault:shared-db'
|
|
||||||
- 'vault-mysql-router:shared-db'
|
|
||||||
- - 'vault-mysql-router:db-router'
|
|
||||||
- 'mysql-innodb-cluster:db-router'
|
|
||||||
|
|
||||||
- - 'vault:certificates'
|
|
||||||
- 'keystone:certificates'
|
|
||||||
|
|
||||||
- - 'vault:certificates'
|
|
||||||
- 'glance:certificates'
|
|
||||||
|
|
||||||
- - 'vault:certificates'
|
|
||||||
- 'openstack-dashboard:certificates'
|
|
||||||
|
|
||||||
- - 'openstack-dashboard'
|
|
||||||
- 'keystone-saml-mellon1'
|
|
||||||
- - 'openstack-dashboard'
|
|
||||||
- 'keystone-saml-mellon2'
|
|
||||||
|
|
||||||
- - 'keystone:websso-trusted-dashboard'
|
|
||||||
- 'openstack-dashboard:websso-trusted-dashboard'
|
|
||||||
|
|
||||||
- - 'vault:certificates'
|
|
||||||
- 'cinder:certificates'
|
|
||||||
|
|
||||||
- - 'vault:certificates'
|
|
||||||
- 'neutron-api:certificates'
|
|
||||||
|
|
||||||
- - 'vault:certificates'
|
|
||||||
- 'nova-cloud-controller:certificates'
|
|
||||||
|
|
||||||
- - 'placement:identity-service'
|
|
||||||
- 'keystone:identity-service'
|
|
||||||
|
|
||||||
- - 'placement:placement'
|
|
||||||
- 'nova-cloud-controller:placement'
|
|
||||||
|
|
||||||
- - 'vault:certificates'
|
|
||||||
- 'placement:certificates'
|
|
||||||
|
|
||||||
- - "placement:shared-db"
|
|
||||||
- "placement-mysql-router:shared-db"
|
|
||||||
- - "placement-mysql-router:db-router"
|
|
||||||
- "mysql-innodb-cluster:db-router"
|
|
||||||
|
|
||||||
- - "keystone:ha"
|
|
||||||
- "keystone-hacluster:ha"
|
|
||||||
- - "openstack-dashboard:ha"
|
|
||||||
- "openstack-dashboard-hacluster:ha"
|
|
|
@ -1,370 +0,0 @@
|
||||||
variables:
|
|
||||||
openstack-origin: &openstack-origin distro
|
|
||||||
|
|
||||||
series: hirsute
|
|
||||||
|
|
||||||
comment:
|
|
||||||
- 'machines section to decide order of deployment. database sooner = faster'
|
|
||||||
machines:
|
|
||||||
'0':
|
|
||||||
constraints: mem=3072M
|
|
||||||
'1':
|
|
||||||
constraints: mem=3072M
|
|
||||||
'2':
|
|
||||||
constraints: mem=3072M
|
|
||||||
'3':
|
|
||||||
'4':
|
|
||||||
'5':
|
|
||||||
'6':
|
|
||||||
'7':
|
|
||||||
'8':
|
|
||||||
'9':
|
|
||||||
'10':
|
|
||||||
'11':
|
|
||||||
'12':
|
|
||||||
'13':
|
|
||||||
'14':
|
|
||||||
'15':
|
|
||||||
'16':
|
|
||||||
'17':
|
|
||||||
'18':
|
|
||||||
|
|
||||||
applications:
|
|
||||||
|
|
||||||
keystone-mysql-router:
|
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
|
||||||
neutron-api-mysql-router:
|
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
|
||||||
glance-mysql-router:
|
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
|
||||||
openstack-dashboard-mysql-router:
|
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
|
||||||
nova-cloud-controller-mysql-router:
|
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
|
||||||
cinder-mysql-router:
|
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
|
||||||
vault-mysql-router:
|
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
|
||||||
placement-mysql-router:
|
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
|
||||||
|
|
||||||
mysql-innodb-cluster:
|
|
||||||
charm: cs:~openstack-charmers/mysql-innodb-cluster
|
|
||||||
num_units: 3
|
|
||||||
options:
|
|
||||||
source: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '0'
|
|
||||||
- '1'
|
|
||||||
- '2'
|
|
||||||
|
|
||||||
cinder:
|
|
||||||
num_units: 1
|
|
||||||
charm: cs:~openstack-charmers/cinder
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
glance-api-version: 2
|
|
||||||
block-device: None
|
|
||||||
to:
|
|
||||||
- '3'
|
|
||||||
|
|
||||||
glance:
|
|
||||||
charm: cs:~openstack-charmers/glance
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '4'
|
|
||||||
|
|
||||||
keystone:
|
|
||||||
charm: cs:~openstack-charmers/keystone
|
|
||||||
num_units: 3
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
token-provider: 'fernet'
|
|
||||||
to:
|
|
||||||
- '5'
|
|
||||||
- '6'
|
|
||||||
- '7'
|
|
||||||
|
|
||||||
neutron-api:
|
|
||||||
charm: cs:~openstack-charmers/neutron-api
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
manage-neutron-plugin-legacy-mode: true
|
|
||||||
flat-network-providers: physnet1
|
|
||||||
neutron-security-groups: true
|
|
||||||
to:
|
|
||||||
- '8'
|
|
||||||
|
|
||||||
neutron-gateway:
|
|
||||||
charm: cs:~openstack-charmers/neutron-gateway
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
bridge-mappings: physnet1:br-ex
|
|
||||||
to:
|
|
||||||
- '9'
|
|
||||||
|
|
||||||
neutron-openvswitch:
|
|
||||||
charm: cs:~openstack-charmers/neutron-openvswitch
|
|
||||||
num_units: 0
|
|
||||||
|
|
||||||
nova-cloud-controller:
|
|
||||||
charm: cs:~openstack-charmers/nova-cloud-controller
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
network-manager: Neutron
|
|
||||||
to:
|
|
||||||
- '10'
|
|
||||||
|
|
||||||
nova-compute:
|
|
||||||
charm: cs:~openstack-charmers/nova-compute
|
|
||||||
num_units: 2
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
config-flags: default_ephemeral_format=ext4
|
|
||||||
enable-live-migration: true
|
|
||||||
enable-resize: true
|
|
||||||
migration-auth-type: ssh
|
|
||||||
to:
|
|
||||||
- '11'
|
|
||||||
- '12'
|
|
||||||
|
|
||||||
openstack-dashboard:
|
|
||||||
charm: cs:~openstack-charmers/openstack-dashboard
|
|
||||||
num_units: 3
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '13'
|
|
||||||
- '14'
|
|
||||||
- '15'
|
|
||||||
|
|
||||||
rabbitmq-server:
|
|
||||||
charm: cs:~openstack-charmers/rabbitmq-server
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
source: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '16'
|
|
||||||
|
|
||||||
vault:
|
|
||||||
num_units: 1
|
|
||||||
charm: cs:~openstack-charmers/vault
|
|
||||||
to:
|
|
||||||
- '17'
|
|
||||||
|
|
||||||
placement:
|
|
||||||
charm: cs:~openstack-charmers/placement
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '18'
|
|
||||||
|
|
||||||
keystone-saml-mellon1:
|
|
||||||
series: groovy
|
|
||||||
charm: ../../../keystone-saml-mellon
|
|
||||||
num_units: 0
|
|
||||||
options:
|
|
||||||
idp-name: 'test-saml-idp1'
|
|
||||||
protocol-name: 'mapped'
|
|
||||||
user-facing-name: "Test SAML IDP #1"
|
|
||||||
subject-confirmation-data-address-check: False
|
|
||||||
nameid-formats: "urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress"
|
|
||||||
test-saml-idp1:
|
|
||||||
charm: cs:~ionutbalutoiu/test-saml-idp
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
idp-name: 'test-saml-idp1'
|
|
||||||
protocol-name: 'mapped'
|
|
||||||
auth-user-name: 'user1'
|
|
||||||
auth-user-password: 'userpass1'
|
|
||||||
|
|
||||||
keystone-saml-mellon2:
|
|
||||||
series: groovy
|
|
||||||
charm: ../../../keystone-saml-mellon
|
|
||||||
num_units: 0
|
|
||||||
options:
|
|
||||||
idp-name: 'test-saml-idp2'
|
|
||||||
protocol-name: 'mapped'
|
|
||||||
user-facing-name: "Test SAML IDP #2"
|
|
||||||
subject-confirmation-data-address-check: False
|
|
||||||
nameid-formats: "urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress"
|
|
||||||
test-saml-idp2:
|
|
||||||
charm: cs:~ionutbalutoiu/test-saml-idp
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
idp-name: 'test-saml-idp2'
|
|
||||||
protocol-name: 'mapped'
|
|
||||||
auth-user-name: 'user2'
|
|
||||||
auth-user-password: 'userpass2'
|
|
||||||
|
|
||||||
keystone-hacluster:
|
|
||||||
charm: cs:~openstack-charmers/hacluster
|
|
||||||
num_units: 0
|
|
||||||
options:
|
|
||||||
corosync_transport: unicast
|
|
||||||
cluster_count: 3
|
|
||||||
openstack-dashboard-hacluster:
|
|
||||||
charm: cs:~openstack-charmers/hacluster
|
|
||||||
num_units: 0
|
|
||||||
options:
|
|
||||||
corosync_transport: unicast
|
|
||||||
cluster_count: 3
|
|
||||||
|
|
||||||
relations:
|
|
||||||
|
|
||||||
- - 'nova-compute:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
|
|
||||||
- - 'neutron-gateway:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
|
|
||||||
- - 'keystone:shared-db'
|
|
||||||
- 'keystone-mysql-router:shared-db'
|
|
||||||
- - 'keystone-mysql-router:db-router'
|
|
||||||
- 'mysql-innodb-cluster:db-router'
|
|
||||||
|
|
||||||
- - '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'
|
|
||||||
- 'neutron-api-mysql-router:shared-db'
|
|
||||||
- - 'neutron-api-mysql-router:db-router'
|
|
||||||
- 'mysql-innodb-cluster:db-router'
|
|
||||||
|
|
||||||
- - 'neutron-api:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
|
|
||||||
- - 'neutron-gateway:neutron-plugin-api'
|
|
||||||
- 'neutron-api:neutron-plugin-api'
|
|
||||||
|
|
||||||
- - 'glance:shared-db'
|
|
||||||
- 'glance-mysql-router:shared-db'
|
|
||||||
- - 'glance-mysql-router:db-router'
|
|
||||||
- 'mysql-innodb-cluster:db-router'
|
|
||||||
|
|
||||||
- - '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-cloud-controller:quantum-network-service'
|
|
||||||
- 'neutron-gateway:quantum-network-service'
|
|
||||||
|
|
||||||
- - 'nova-compute:neutron-plugin'
|
|
||||||
- 'neutron-openvswitch:neutron-plugin'
|
|
||||||
|
|
||||||
- - 'neutron-openvswitch:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
|
|
||||||
- - 'openstack-dashboard:identity-service'
|
|
||||||
- 'keystone:identity-service'
|
|
||||||
|
|
||||||
- - 'openstack-dashboard:shared-db'
|
|
||||||
- 'openstack-dashboard-mysql-router:shared-db'
|
|
||||||
- - 'openstack-dashboard-mysql-router:db-router'
|
|
||||||
- 'mysql-innodb-cluster:db-router'
|
|
||||||
|
|
||||||
- - 'nova-cloud-controller:shared-db'
|
|
||||||
- 'nova-cloud-controller-mysql-router:shared-db'
|
|
||||||
- - 'nova-cloud-controller-mysql-router:db-router'
|
|
||||||
- 'mysql-innodb-cluster:db-router'
|
|
||||||
|
|
||||||
- - 'nova-cloud-controller:neutron-api'
|
|
||||||
- 'neutron-api:neutron-api'
|
|
||||||
|
|
||||||
- - 'cinder:image-service'
|
|
||||||
- 'glance:image-service'
|
|
||||||
|
|
||||||
- - 'cinder:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
|
|
||||||
- - 'cinder:identity-service'
|
|
||||||
- 'keystone:identity-service'
|
|
||||||
|
|
||||||
- - 'cinder:cinder-volume-service'
|
|
||||||
- 'nova-cloud-controller:cinder-volume-service'
|
|
||||||
|
|
||||||
- - 'cinder:shared-db'
|
|
||||||
- 'cinder-mysql-router:shared-db'
|
|
||||||
- - 'cinder-mysql-router:db-router'
|
|
||||||
- 'mysql-innodb-cluster:db-router'
|
|
||||||
|
|
||||||
- - 'keystone'
|
|
||||||
- 'keystone-saml-mellon1'
|
|
||||||
- - 'keystone'
|
|
||||||
- 'keystone-saml-mellon2'
|
|
||||||
|
|
||||||
- - 'vault:shared-db'
|
|
||||||
- 'vault-mysql-router:shared-db'
|
|
||||||
- - 'vault-mysql-router:db-router'
|
|
||||||
- 'mysql-innodb-cluster:db-router'
|
|
||||||
|
|
||||||
- - 'vault:certificates'
|
|
||||||
- 'keystone:certificates'
|
|
||||||
|
|
||||||
- - 'vault:certificates'
|
|
||||||
- 'glance:certificates'
|
|
||||||
|
|
||||||
- - 'vault:certificates'
|
|
||||||
- 'openstack-dashboard:certificates'
|
|
||||||
|
|
||||||
- - 'openstack-dashboard'
|
|
||||||
- 'keystone-saml-mellon1'
|
|
||||||
- - 'openstack-dashboard'
|
|
||||||
- 'keystone-saml-mellon2'
|
|
||||||
|
|
||||||
- - 'keystone:websso-trusted-dashboard'
|
|
||||||
- 'openstack-dashboard:websso-trusted-dashboard'
|
|
||||||
|
|
||||||
- - 'vault:certificates'
|
|
||||||
- 'cinder:certificates'
|
|
||||||
|
|
||||||
- - 'vault:certificates'
|
|
||||||
- 'neutron-api:certificates'
|
|
||||||
|
|
||||||
- - 'vault:certificates'
|
|
||||||
- 'nova-cloud-controller:certificates'
|
|
||||||
|
|
||||||
- - 'placement:identity-service'
|
|
||||||
- 'keystone:identity-service'
|
|
||||||
|
|
||||||
- - 'placement:placement'
|
|
||||||
- 'nova-cloud-controller:placement'
|
|
||||||
|
|
||||||
- - 'vault:certificates'
|
|
||||||
- 'placement:certificates'
|
|
||||||
|
|
||||||
- - "placement:shared-db"
|
|
||||||
- "placement-mysql-router:shared-db"
|
|
||||||
- - "placement-mysql-router:db-router"
|
|
||||||
- "mysql-innodb-cluster:db-router"
|
|
||||||
|
|
||||||
- - "keystone:ha"
|
|
||||||
- "keystone-hacluster:ha"
|
|
||||||
- - "openstack-dashboard:ha"
|
|
||||||
- "openstack-dashboard-hacluster:ha"
|
|
|
@ -1,26 +0,0 @@
|
||||||
relations:
|
|
||||||
- - keystone
|
|
||||||
- keystone-hacluster
|
|
||||||
- - openstack-dashboard
|
|
||||||
- openstack-dashboard-hacluster
|
|
||||||
applications:
|
|
||||||
keystone:
|
|
||||||
num_units: 3
|
|
||||||
options:
|
|
||||||
vip: {{ OS_VIP00 }}
|
|
||||||
openstack-dashboard:
|
|
||||||
num_units: 3
|
|
||||||
options:
|
|
||||||
vip: {{ OS_VIP01 }}
|
|
||||||
keystone-hacluster:
|
|
||||||
charm: cs:~openstack-charmers/hacluster
|
|
||||||
num_units: 0
|
|
||||||
options:
|
|
||||||
corosync_transport: unicast
|
|
||||||
cluster_count: 3
|
|
||||||
openstack-dashboard-hacluster:
|
|
||||||
charm: cs:~openstack-charmers/hacluster
|
|
||||||
num_units: 0
|
|
||||||
options:
|
|
||||||
corosync_transport: unicast
|
|
||||||
cluster_count: 3
|
|
|
@ -1,26 +0,0 @@
|
||||||
relations:
|
|
||||||
- - keystone
|
|
||||||
- keystone-hacluster
|
|
||||||
- - openstack-dashboard
|
|
||||||
- openstack-dashboard-hacluster
|
|
||||||
applications:
|
|
||||||
keystone:
|
|
||||||
num_units: 3
|
|
||||||
options:
|
|
||||||
vip: {{ OS_VIP00 }}
|
|
||||||
openstack-dashboard:
|
|
||||||
num_units: 3
|
|
||||||
options:
|
|
||||||
vip: {{ OS_VIP01 }}
|
|
||||||
keystone-hacluster:
|
|
||||||
charm: cs:~openstack-charmers/hacluster
|
|
||||||
num_units: 0
|
|
||||||
options:
|
|
||||||
corosync_transport: unicast
|
|
||||||
cluster_count: 3
|
|
||||||
openstack-dashboard-hacluster:
|
|
||||||
charm: cs:~openstack-charmers/hacluster
|
|
||||||
num_units: 0
|
|
||||||
options:
|
|
||||||
corosync_transport: unicast
|
|
||||||
cluster_count: 3
|
|
|
@ -1,26 +0,0 @@
|
||||||
relations:
|
|
||||||
- - keystone
|
|
||||||
- keystone-hacluster
|
|
||||||
- - openstack-dashboard
|
|
||||||
- openstack-dashboard-hacluster
|
|
||||||
applications:
|
|
||||||
keystone:
|
|
||||||
num_units: 3
|
|
||||||
options:
|
|
||||||
vip: {{ OS_VIP00 }}
|
|
||||||
openstack-dashboard:
|
|
||||||
num_units: 3
|
|
||||||
options:
|
|
||||||
vip: {{ OS_VIP01 }}
|
|
||||||
keystone-hacluster:
|
|
||||||
charm: cs:~openstack-charmers/hacluster
|
|
||||||
num_units: 0
|
|
||||||
options:
|
|
||||||
corosync_transport: unicast
|
|
||||||
cluster_count: 3
|
|
||||||
openstack-dashboard-hacluster:
|
|
||||||
charm: cs:~openstack-charmers/hacluster
|
|
||||||
num_units: 0
|
|
||||||
options:
|
|
||||||
corosync_transport: unicast
|
|
||||||
cluster_count: 3
|
|
|
@ -1,7 +0,0 @@
|
||||||
applications:
|
|
||||||
keystone:
|
|
||||||
options:
|
|
||||||
vip: {{ OS_VIP00 }}
|
|
||||||
openstack-dashboard:
|
|
||||||
options:
|
|
||||||
vip: {{ OS_VIP01 }}
|
|
|
@ -1,7 +0,0 @@
|
||||||
applications:
|
|
||||||
keystone:
|
|
||||||
options:
|
|
||||||
vip: {{ OS_VIP00 }}
|
|
||||||
openstack-dashboard:
|
|
||||||
options:
|
|
||||||
vip: {{ OS_VIP01 }}
|
|
|
@ -1,7 +0,0 @@
|
||||||
applications:
|
|
||||||
keystone:
|
|
||||||
options:
|
|
||||||
vip: {{ OS_VIP00 }}
|
|
||||||
openstack-dashboard:
|
|
||||||
options:
|
|
||||||
vip: {{ OS_VIP01 }}
|
|
|
@ -0,0 +1 @@
|
||||||
|
ha.yaml.j2
|
|
@ -0,0 +1 @@
|
||||||
|
ha.yaml.j2
|
|
@ -1,7 +0,0 @@
|
||||||
applications:
|
|
||||||
keystone:
|
|
||||||
options:
|
|
||||||
vip: {{ OS_VIP00 }}
|
|
||||||
openstack-dashboard:
|
|
||||||
options:
|
|
||||||
vip: {{ OS_VIP01 }}
|
|
|
@ -1,7 +0,0 @@
|
||||||
applications:
|
|
||||||
keystone:
|
|
||||||
options:
|
|
||||||
vip: {{ OS_VIP00 }}
|
|
||||||
openstack-dashboard:
|
|
||||||
options:
|
|
||||||
vip: {{ OS_VIP01 }}
|
|
|
@ -1,17 +1,11 @@
|
||||||
charm_name: keystone-saml-mellon
|
charm_name: keystone-saml-mellon
|
||||||
|
|
||||||
smoke_bundles:
|
smoke_bundles:
|
||||||
- focal-ussuri-ha
|
- focal-xena-ha
|
||||||
|
|
||||||
gate_bundles:
|
gate_bundles:
|
||||||
- bionic-queens-ha
|
|
||||||
- focal-ussuri-ha
|
|
||||||
- focal-victoria-ha
|
|
||||||
- focal-wallaby-ha
|
- focal-wallaby-ha
|
||||||
- groovy-victoria-ha
|
- focal-xena-ha
|
||||||
|
|
||||||
dev_bundles:
|
|
||||||
- hirsute-wallaby-ha
|
|
||||||
|
|
||||||
configure:
|
configure:
|
||||||
- zaza.openstack.charm_tests.vault.setup.auto_initialize
|
- zaza.openstack.charm_tests.vault.setup.auto_initialize
|
||||||
|
@ -46,16 +40,12 @@ target_deploy_status:
|
||||||
workload-status: blocked
|
workload-status: blocked
|
||||||
workload-status-message: "Configuration is incomplete. idp-metadata: idp-metadata resource has not been provided,sp-signing-keyinfo: sp-signing-keyinfo resource has not been provided,sp-private-key: sp-private-key resource has not been provided"
|
workload-status-message: "Configuration is incomplete. idp-metadata: idp-metadata resource has not been provided,sp-signing-keyinfo: sp-signing-keyinfo resource has not been provided,sp-private-key: sp-private-key resource has not been provided"
|
||||||
test-saml-idp1:
|
test-saml-idp1:
|
||||||
workload-status: blocked
|
workload-status: unknown
|
||||||
workload-status-message: "sp-metadata resource is not a well-formed xml file"
|
workload-status-message: ""
|
||||||
keystone-saml-mellon2:
|
keystone-saml-mellon2:
|
||||||
workload-status: blocked
|
workload-status: blocked
|
||||||
workload-status-message: "Configuration is incomplete. idp-metadata: idp-metadata resource has not been provided,sp-signing-keyinfo: sp-signing-keyinfo resource has not been provided,sp-private-key: sp-private-key resource has not been provided"
|
workload-status-message: "Configuration is incomplete. idp-metadata: idp-metadata resource has not been provided,sp-signing-keyinfo: sp-signing-keyinfo resource has not been provided,sp-private-key: sp-private-key resource has not been provided"
|
||||||
test-saml-idp2:
|
test-saml-idp2:
|
||||||
workload-status: blocked
|
workload-status: unknown
|
||||||
workload-status-message: "sp-metadata resource is not a well-formed xml file"
|
workload-status-message: ""
|
||||||
|
|
||||||
tests_options:
|
|
||||||
force_deploy:
|
|
||||||
- hirsute-wallaby-ha
|
|
||||||
- groovy-victoria-ha
|
|
||||||
|
|
|
@ -6,6 +6,6 @@ cryptography<3.4
|
||||||
lxml
|
lxml
|
||||||
psutil
|
psutil
|
||||||
|
|
||||||
git+https://github.com/openstack/charms.openstack.git@stable/21.10#egg=charms.openstack
|
git+https://github.com/openstack/charms.openstack.git@stable/xena#egg=charms.openstack
|
||||||
|
|
||||||
git+https://github.com/juju/charm-helpers.git@stable/21.10#egg=charmhelpers
|
git+https://github.com/juju/charm-helpers@stable/xena#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/xena#egg=charms.openstack
|
||||||
#
|
#
|
||||||
# Revisit for removal / mock improvement:
|
# Revisit for removal / mock improvement:
|
||||||
#
|
#
|
||||||
|
|
30
tox.ini
30
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}
|
||||||
|
|
||||||
|
@ -75,12 +88,29 @@ 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: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