Add docs key and point at Discourse
Add the 'docs' key and point it at a Discourse topic
previously populated with the charm's README contents.
When the new charm revision is released to the Charmhub,
this Discourse-based content will be displayed there. In
the absense of the this new key, the Charmhub's default
behaviour is to display the value of the charm's
'description' key.
func-test-pr: https://github.com/openstack-charmers/zaza-openstack-tests/pull/1108
Change-Id: I782890f44628a634c7adcf9cdace753c62d6c262
(cherry picked from commit 9abe25f182)
This commit is contained in:
Peter Matulis
Peter Sabaini
parent
fc01acc7ea
commit
cd35a3eef6
@ -4,6 +4,7 @@ maintainer: OpenStack Charmers <openstack-charmers@lists.ubuntu.com>
|
|||||||
description: |
|
description: |
|
||||||
Ceph is a distributed storage and network file system designed to provide
|
Ceph is a distributed storage and network file system designed to provide
|
||||||
excellent performance, reliability, and scalability.
|
excellent performance, reliability, and scalability.
|
||||||
|
docs: https://discourse.charmhub.io/t/ceph-proxy-docs-index/11218
|
||||||
tags:
|
tags:
|
||||||
- openstack
|
- openstack
|
||||||
- storage
|
- storage
|
||||||
|
|||||||
13
osci.yaml
13
osci.yaml
@ -1,16 +1,14 @@
|
|||||||
- project:
|
- project:
|
||||||
templates:
|
templates:
|
||||||
- charm-unit-jobs-py38
|
- charm-unit-jobs-py38
|
||||||
- charm-unit-jobs-py39
|
|
||||||
- charm-unit-jobs-py310
|
- charm-unit-jobs-py310
|
||||||
- charm-zed-functional-jobs
|
|
||||||
check:
|
check:
|
||||||
jobs:
|
jobs:
|
||||||
|
- jammy-yoga
|
||||||
- jammy-yoga-ec
|
- jammy-yoga-ec
|
||||||
|
- jammy-zed
|
||||||
- jammy-antelope:
|
- jammy-antelope:
|
||||||
voting: true
|
voting: true
|
||||||
- kinetic-zed-ec:
|
|
||||||
voting: false
|
|
||||||
- lunar-antelope-ec:
|
- lunar-antelope-ec:
|
||||||
voting: false
|
voting: false
|
||||||
- lunar-antelope:
|
- lunar-antelope:
|
||||||
@ -30,13 +28,6 @@
|
|||||||
soft: true
|
soft: true
|
||||||
vars:
|
vars:
|
||||||
tox_extra_args: erasure-coded:jammy-yoga-ec
|
tox_extra_args: erasure-coded:jammy-yoga-ec
|
||||||
- job:
|
|
||||||
name: kinetic-zed-ec
|
|
||||||
parent: func-target
|
|
||||||
dependencies:
|
|
||||||
- jammy-yoga-ec
|
|
||||||
vars:
|
|
||||||
tox_extra_args: erasure-coded:kinetic-zed-ec
|
|
||||||
- job:
|
- job:
|
||||||
name: lunar-antelope-ec
|
name: lunar-antelope-ec
|
||||||
parent: func-target
|
parent: func-target
|
||||||
|
|||||||
@ -1,228 +0,0 @@
|
|||||||
variables:
|
|
||||||
openstack-origin: &openstack-origin distro
|
|
||||||
|
|
||||||
series: kinetic
|
|
||||||
|
|
||||||
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:
|
|
||||||
|
|
||||||
cinder-mysql-router:
|
|
||||||
charm: ch:mysql-router
|
|
||||||
channel: latest/edge
|
|
||||||
glance-mysql-router:
|
|
||||||
charm: ch:mysql-router
|
|
||||||
channel: latest/edge
|
|
||||||
keystone-mysql-router:
|
|
||||||
charm: ch:mysql-router
|
|
||||||
channel: latest/edge
|
|
||||||
|
|
||||||
mysql-innodb-cluster:
|
|
||||||
charm: ch:mysql-innodb-cluster
|
|
||||||
num_units: 3
|
|
||||||
options:
|
|
||||||
source: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '0'
|
|
||||||
- '1'
|
|
||||||
- '2'
|
|
||||||
channel: latest/edge
|
|
||||||
|
|
||||||
ceph-mon:
|
|
||||||
charm: ch:ceph-mon
|
|
||||||
num_units: 3
|
|
||||||
options:
|
|
||||||
expected-osd-count: 3
|
|
||||||
source: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '3'
|
|
||||||
- '4'
|
|
||||||
- '5'
|
|
||||||
channel: latest/edge
|
|
||||||
|
|
||||||
ceph-osd:
|
|
||||||
charm: ch:ceph-osd
|
|
||||||
num_units: 6
|
|
||||||
storage:
|
|
||||||
osd-devices: 'cinder,10G,2'
|
|
||||||
options:
|
|
||||||
source: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '6'
|
|
||||||
- '7'
|
|
||||||
- '8'
|
|
||||||
- '16'
|
|
||||||
- '17'
|
|
||||||
- '18'
|
|
||||||
channel: latest/edge
|
|
||||||
|
|
||||||
ceph-proxy:
|
|
||||||
charm: ../../ceph-proxy.charm
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
source: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '9'
|
|
||||||
|
|
||||||
ceph-radosgw:
|
|
||||||
charm: ch:ceph-radosgw
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
source: *openstack-origin
|
|
||||||
pool-type: erasure-coded
|
|
||||||
ec-profile-k: 4
|
|
||||||
ec-profile-m: 2
|
|
||||||
to:
|
|
||||||
- '10'
|
|
||||||
channel: latest/edge
|
|
||||||
|
|
||||||
cinder:
|
|
||||||
charm: ch:cinder
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
block-device: ""
|
|
||||||
ephemeral-unmount: ""
|
|
||||||
glance-api-version: 2
|
|
||||||
overwrite: "false"
|
|
||||||
constraints: mem=2048
|
|
||||||
to:
|
|
||||||
- '11'
|
|
||||||
channel: latest/edge
|
|
||||||
|
|
||||||
cinder-ceph:
|
|
||||||
charm: ch:cinder-ceph
|
|
||||||
options:
|
|
||||||
restrict-ceph-pools: True
|
|
||||||
pool-type: erasure-coded
|
|
||||||
ec-profile-k: 4
|
|
||||||
ec-profile-m: 2
|
|
||||||
ec-profile-plugin: lrc
|
|
||||||
ec-profile-locality: 3
|
|
||||||
channel: latest/edge
|
|
||||||
|
|
||||||
keystone:
|
|
||||||
charm: ch:keystone
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
admin-password: openstack
|
|
||||||
constraints: mem=1024
|
|
||||||
to:
|
|
||||||
- '12'
|
|
||||||
channel: latest/edge
|
|
||||||
|
|
||||||
rabbitmq-server:
|
|
||||||
charm: ch:rabbitmq-server
|
|
||||||
num_units: 1
|
|
||||||
constraints: mem=1024
|
|
||||||
options:
|
|
||||||
source: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '13'
|
|
||||||
channel: latest/edge
|
|
||||||
|
|
||||||
glance:
|
|
||||||
charm: ch:glance
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
pool-type: erasure-coded
|
|
||||||
ec-profile-k: 4
|
|
||||||
ec-profile-m: 2
|
|
||||||
ec-profile-plugin: jerasure
|
|
||||||
to:
|
|
||||||
- '14'
|
|
||||||
channel: latest/edge
|
|
||||||
|
|
||||||
nova-compute:
|
|
||||||
charm: ch:nova-compute
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
pool-type: erasure-coded
|
|
||||||
ec-profile-k: 4
|
|
||||||
ec-profile-m: 2
|
|
||||||
ec-profile-plugin: isa
|
|
||||||
libvirt-image-backend: rbd
|
|
||||||
to:
|
|
||||||
- '15'
|
|
||||||
channel: latest/edge
|
|
||||||
|
|
||||||
|
|
||||||
relations:
|
|
||||||
|
|
||||||
- - 'ceph-osd:mon'
|
|
||||||
- 'ceph-mon:osd'
|
|
||||||
|
|
||||||
- - 'ceph-proxy:radosgw'
|
|
||||||
- 'ceph-radosgw:mon'
|
|
||||||
|
|
||||||
- - 'cinder:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
|
|
||||||
- - 'cinder:shared-db'
|
|
||||||
- 'cinder-mysql-router:shared-db'
|
|
||||||
- - 'cinder-mysql-router:db-router'
|
|
||||||
- 'mysql-innodb-cluster:db-router'
|
|
||||||
|
|
||||||
- - 'keystone:shared-db'
|
|
||||||
- 'keystone-mysql-router:shared-db'
|
|
||||||
- - 'keystone-mysql-router:db-router'
|
|
||||||
- 'mysql-innodb-cluster:db-router'
|
|
||||||
|
|
||||||
- - 'cinder:identity-service'
|
|
||||||
- 'keystone:identity-service'
|
|
||||||
|
|
||||||
- - 'cinder-ceph:storage-backend'
|
|
||||||
- 'cinder:storage-backend'
|
|
||||||
|
|
||||||
- - 'cinder-ceph:ceph'
|
|
||||||
- 'ceph-proxy:client'
|
|
||||||
|
|
||||||
- - 'glance:image-service'
|
|
||||||
- 'nova-compute:image-service'
|
|
||||||
|
|
||||||
- - 'glance:identity-service'
|
|
||||||
- 'keystone:identity-service'
|
|
||||||
|
|
||||||
- - 'glance:shared-db'
|
|
||||||
- 'glance-mysql-router:shared-db'
|
|
||||||
- - 'glance-mysql-router:db-router'
|
|
||||||
- 'mysql-innodb-cluster:db-router'
|
|
||||||
|
|
||||||
- - 'glance:ceph'
|
|
||||||
- 'ceph-proxy:client'
|
|
||||||
|
|
||||||
- - 'nova-compute:ceph-access'
|
|
||||||
- 'cinder-ceph:ceph-access'
|
|
||||||
|
|
||||||
- - 'nova-compute:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
|
|
||||||
- - 'nova-compute:ceph'
|
|
||||||
- 'ceph-proxy:client'
|
|
||||||
@ -1,199 +0,0 @@
|
|||||||
variables:
|
|
||||||
openstack-origin: &openstack-origin distro
|
|
||||||
|
|
||||||
series: kinetic
|
|
||||||
|
|
||||||
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':
|
|
||||||
|
|
||||||
applications:
|
|
||||||
|
|
||||||
cinder-mysql-router:
|
|
||||||
charm: ch:mysql-router
|
|
||||||
channel: latest/edge
|
|
||||||
glance-mysql-router:
|
|
||||||
charm: ch:mysql-router
|
|
||||||
channel: latest/edge
|
|
||||||
keystone-mysql-router:
|
|
||||||
charm: ch:mysql-router
|
|
||||||
channel: latest/edge
|
|
||||||
|
|
||||||
mysql-innodb-cluster:
|
|
||||||
charm: ch:mysql-innodb-cluster
|
|
||||||
num_units: 3
|
|
||||||
options:
|
|
||||||
source: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '0'
|
|
||||||
- '1'
|
|
||||||
- '2'
|
|
||||||
channel: latest/edge
|
|
||||||
|
|
||||||
ceph-mon:
|
|
||||||
charm: ch:ceph-mon
|
|
||||||
num_units: 3
|
|
||||||
options:
|
|
||||||
expected-osd-count: 3
|
|
||||||
source: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '3'
|
|
||||||
- '4'
|
|
||||||
- '5'
|
|
||||||
channel: latest/edge
|
|
||||||
|
|
||||||
ceph-osd:
|
|
||||||
charm: ch:ceph-osd
|
|
||||||
num_units: 3
|
|
||||||
storage:
|
|
||||||
osd-devices: 'cinder,10G,2'
|
|
||||||
options:
|
|
||||||
source: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '6'
|
|
||||||
- '7'
|
|
||||||
- '8'
|
|
||||||
channel: latest/edge
|
|
||||||
|
|
||||||
ceph-proxy:
|
|
||||||
charm: ../../ceph-proxy.charm
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
source: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '9'
|
|
||||||
|
|
||||||
ceph-radosgw:
|
|
||||||
charm: ch:ceph-radosgw
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
source: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '10'
|
|
||||||
channel: latest/edge
|
|
||||||
|
|
||||||
cinder:
|
|
||||||
charm: ch:cinder
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
block-device: ""
|
|
||||||
ephemeral-unmount: ""
|
|
||||||
glance-api-version: 2
|
|
||||||
overwrite: "false"
|
|
||||||
constraints: mem=2048
|
|
||||||
to:
|
|
||||||
- '11'
|
|
||||||
channel: latest/edge
|
|
||||||
|
|
||||||
cinder-ceph:
|
|
||||||
charm: ch:cinder-ceph
|
|
||||||
options:
|
|
||||||
restrict-ceph-pools: True
|
|
||||||
channel: latest/edge
|
|
||||||
|
|
||||||
keystone:
|
|
||||||
charm: ch:keystone
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
admin-password: openstack
|
|
||||||
constraints: mem=1024
|
|
||||||
to:
|
|
||||||
- '12'
|
|
||||||
channel: latest/edge
|
|
||||||
|
|
||||||
rabbitmq-server:
|
|
||||||
charm: ch:rabbitmq-server
|
|
||||||
num_units: 1
|
|
||||||
constraints: mem=1024
|
|
||||||
options:
|
|
||||||
source: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '13'
|
|
||||||
channel: latest/edge
|
|
||||||
|
|
||||||
glance:
|
|
||||||
charm: ch:glance
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '14'
|
|
||||||
channel: latest/edge
|
|
||||||
|
|
||||||
nova-compute:
|
|
||||||
charm: ch:nova-compute
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '15'
|
|
||||||
channel: latest/edge
|
|
||||||
|
|
||||||
|
|
||||||
relations:
|
|
||||||
|
|
||||||
- - 'ceph-osd:mon'
|
|
||||||
- 'ceph-mon:osd'
|
|
||||||
|
|
||||||
- - 'ceph-proxy:radosgw'
|
|
||||||
- 'ceph-radosgw:mon'
|
|
||||||
|
|
||||||
- - 'cinder:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
|
|
||||||
- - 'cinder:shared-db'
|
|
||||||
- 'cinder-mysql-router:shared-db'
|
|
||||||
- - 'cinder-mysql-router:db-router'
|
|
||||||
- 'mysql-innodb-cluster:db-router'
|
|
||||||
|
|
||||||
- - 'keystone:shared-db'
|
|
||||||
- 'keystone-mysql-router:shared-db'
|
|
||||||
- - 'keystone-mysql-router:db-router'
|
|
||||||
- 'mysql-innodb-cluster:db-router'
|
|
||||||
|
|
||||||
- - 'cinder:identity-service'
|
|
||||||
- 'keystone:identity-service'
|
|
||||||
|
|
||||||
- - 'cinder-ceph:storage-backend'
|
|
||||||
- 'cinder:storage-backend'
|
|
||||||
|
|
||||||
- - 'cinder-ceph:ceph'
|
|
||||||
- 'ceph-proxy:client'
|
|
||||||
|
|
||||||
- - 'glance:image-service'
|
|
||||||
- 'nova-compute:image-service'
|
|
||||||
|
|
||||||
- - 'glance:identity-service'
|
|
||||||
- 'keystone:identity-service'
|
|
||||||
|
|
||||||
- - 'glance:shared-db'
|
|
||||||
- 'glance-mysql-router:shared-db'
|
|
||||||
- - 'glance-mysql-router:db-router'
|
|
||||||
- 'mysql-innodb-cluster:db-router'
|
|
||||||
|
|
||||||
- - 'nova-compute:ceph-access'
|
|
||||||
- 'cinder-ceph:ceph-access'
|
|
||||||
|
|
||||||
- - 'nova-compute:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
Loading…
Reference in New Issue
Block a user