airship
/
treasuremap
Code Issues Proposed changes

Alignment of upstream code to 2.7 

This commit fix following items in upstream to align the code base to
2.7. The commit is tested and working fine in the Lab.

1. Fix the chart versions and corresponding helm toolkit version
   so that we use helm tooklit that support tls(chart rendering was
   failing if not supplied correctly).
2. Correcting the behaviour of kibana and grafana chart.
   The kibana chart looks for the indexes categories to iterate over.
   The manifest was not suppliying that. This will make sure kibana
   chart will install correctly. In the grafana chart the manifest
   didn't supplied the value of dashboard configmaps correctly as
   strings, so chart installation was failing with rendering errors
3. Fix neutron.yaml rallly test timeout so the armada will wait more
   for the rally test for neutron to finish.
4. Disable nova-placement api and include manifest changes for placement
   to be installed as standalone service.
5. Correct the filter section in nova.yaml to align with train
   codebase.
6. Updtate postgress replicas to be 1, since patroni is removed in 2.7
7. Downgrade ceph charts to be on natutilus due to fact that, octpus
   version has osd in crashloopback, the moment rgw pods come in
   osh-infra namespace.Also tune ceph-client timeout
8. Plus couple of changes like deckhand image to fix shiyard error, and
   horizon image change for enabling heat in the dashboard. There are
   other changes as well in the verison.yaml for the images fix of
   several other charts.
9. Fix the issue wherein fluentd is filling the disk and etcd is
   getting killed.
10. Configure nova api to talk to cinder on v3, nova volume attach
    was failing without this.
11. Correcting the language to 'en' for tox gate to pass.
Change-Id: Id3bfefb36a8fa9e4d777858b6428ade66e514345

Change-Id: If70b6b7fc57b6ff647dd676e525fcd2284eeb83c
This commit is contained in:
Jasvinder Singh 2022-07-20 13:34:15 -05:00
parent 2227df4a8d
commit baf984deea
15 changed files with 40976 additions and 17548 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/source/conf.py
View File

@ -68,7 +68,7 @@ release = u'0.1.0'
#
# This is also used if you do content translation via gettext catalogs.
# Usually you set "language" from the command line for these cases.
language = None
language = 'en'
# List of patterns, relative to source directory, that match files and
# directories to ignore when looking for source files.

43
global/schemas/pegleg/AccountCatalogue/v1.yaml
View File

@ -631,6 +631,11 @@ data:
properties:
username:
type: string
placement:
type: object
properties:
username:
type: string
oslo_db:
type: object
properties:
@ -652,6 +657,44 @@ data:
type: string
database:
type: string
placement:
type: object
properties:
placement:
type: object
properties:
role:
type: string
region_name:
type: string
username:
type: string
project_name:
type: string
user_domain_name:
type: string
project_domain_name:
type: string
oslo_messaging:
type: object
properties:
admin:
type: object
properties:
username:
type: string
placement:
type: object
properties:
username:
type: string
oslo_db:
type: object
properties:
username:
type: string
database:
type: string
horizon:
type: object
properties:

57805
global/software/charts/osh-infra/osh-infra-dashboards/grafana.yaml
View File

File diff suppressed because it is too large Load Diff

32
global/software/charts/osh-infra/osh-infra-dashboards/kibana.yaml
View File

@ -99,21 +99,23 @@ data:
create_kibana_indexes:
enabled: true
indexes:
- airship
- audit_tsee
- auth
- calico
- ceph
- flows
- jenkins
- journal
- kernel_syslog
- libvirt
- logstash
- lma
- openstack
- utility_access
- openvswitch
base:
- airship
- audit_tsee
- auth
- calico
- ceph
- flows
- jenkins
- journal
- kernel_syslog
- libvirt
- logstash
- lma
- utility_access
application:
- openstack
- openvswitch
default_index: logstash
kibana:
elasticsearch:

3
global/software/charts/osh/openstack-compute-kit/chart-group.yaml
View File

@ -10,9 +10,10 @@ metadata:
layer: global
storagePolicy: cleartext
data:
description: Deploy Nova, Neutron, Openvswitch, and Libvirt
description: Deploy Nova, Neutron, Openvswitch, Placement, and Libvirt
chart_group:
- libvirt
- openvswitch
- neutron
- placement
- nova

2
global/software/charts/osh/openstack-compute-kit/neutron.yaml
View File

@ -236,7 +236,7 @@ data:
native:
enabled: false
test:
timeout: 720
timeout: 1400
install:
no_hooks: false
upgrade:

21
global/software/charts/osh/openstack-compute-kit/nova.yaml
View File

@ -325,6 +325,20 @@ data:
post:
create: []
values:
manifests:
# NOTE(lamt): disable consoleauth and placement from nova in Train release.
certificates: false
deployment_consoleauth: false
deployment_placement: false
ingress_placement: false
job_db_init_placement: false
job_ks_placement_endpoints: false
job_ks_placement_service: false
job_ks_placement_user: false
pdb_placement: false
secret_keystone_placement: false
service_ingress_placement: false
service_placement: false
dependencies:
static:
rabbit_init:
@ -775,20 +789,14 @@ data:
values:
- RetryFilter
- AvailabilityZoneFilter
- RamFilter
- CoreFilter
- DiskFilter
- ComputeFilter
- ImagePropertiesFilter
- ServerGroupAntiAffinityFilter
- ServerGroupAffinityFilter
- AggregateInstanceExtraSpecsFilter
- AggregateCoreFilter
- AggregateRamFilter
- AggregateMultiTenancyIsolation
- JsonFilter
- IoOpsFilter
- AggregateDiskFilter
- AllHostsFilter
- IsolatedHostsFilter
- AggregateImagePropertiesIsolation
@ -816,6 +824,7 @@ data:
key_pairs: 10
cinder:
http_retries: 6
catalog_info: "volumev3::internalURL"
oslo_messaging_rabbit:
heartbeat_timeout_threshold: 60
audit_middleware_notifications:

416
global/software/charts/osh/openstack-compute-kit/placement.yaml Normal file
View File

@ -0,0 +1,416 @@
---
schema: armada/Chart/v1
metadata:
schema: metadata/Document/v1
name: placement
labels:
name: placement-global
component: placement
layeringDefinition:
abstract: false
layer: global
storagePolicy: cleartext
substitutions:
# Chart source
- src:
schema: pegleg/SoftwareVersions/v1
name: software-versions
path: .charts.osh.placement
dest:
path: .source
# Images
- src:
schema: pegleg/SoftwareVersions/v1
name: software-versions
path: .images.osh.placement
dest:
path: .values.images.tags
# Endpoints
- src:
schema: pegleg/EndpointCatalogue/v1
name: osh_endpoints
path: .osh.identity
dest:
path: .values.endpoints.identity
- src:
schema: pegleg/EndpointCatalogue/v1
name: osh_endpoints
path: .osh.oslo_db
dest:
path: .values.endpoints.oslo_db
- src:
schema: pegleg/EndpointCatalogue/v1
name: osh_endpoints
path: .osh.oslo_messaging
dest:
path: .values.endpoints.oslo_messaging
- src:
schema: pegleg/EndpointCatalogue/v1
name: osh_endpoints
path: .osh.oslo_cache
dest:
path: .values.endpoints.oslo_cache
- src:
schema: pegleg/EndpointCatalogue/v1
name: osh_endpoints
path: .osh.placement
dest:
path: .values.endpoints.placement
# Service Accounts
- src:
schema: pegleg/AccountCatalogue/v1
name: osh_service_accounts
path: .osh.keystone.admin
dest:
path: .values.endpoints.identity.auth.admin
- src:
schema: pegleg/AccountCatalogue/v1
name: osh_service_accounts
path: .osh.placement.placement
dest:
path: .values.endpoints.identity.auth.placement
- src:
schema: pegleg/AccountCatalogue/v1
name: osh_service_accounts
path: .osh.placement.test
dest:
path: .values.endpoints.identity.auth.test
- src:
schema: pegleg/AccountCatalogue/v1
name: osh_service_accounts
path: .osh.oslo_messaging.admin
dest:
path: .values.endpoints.oslo_messaging.auth.admin
- src:
schema: pegleg/AccountCatalogue/v1
name: osh_service_accounts
path: .osh.nova.oslo_messaging.placement
dest:
path: .values.endpoints.oslo_messaging.auth.placement
- src:
schema: pegleg/AccountCatalogue/v1
name: osh_service_accounts
path: .osh.placement.oslo_db.username
dest:
path: .values.endpoints.oslo_db.auth.placement.username
- src:
schema: pegleg/AccountCatalogue/v1
name: osh_service_accounts
path: .osh.placement.oslo_db.database
dest:
path: .values.endpoints.oslo_db.path
pattern: DB_NAME
# Secrets
- dest:
path: .values.endpoints.identity.auth.admin.password
src:
schema: deckhand/Passphrase/v1
name: osh_keystone_admin_password
path: .
- dest:
path: .values.endpoints.identity.auth.placement.password
src:
schema: deckhand/Passphrase/v1
name: osh_placement_password
path: .
- dest:
path: .values.endpoints.identity.auth.test.password
src:
schema: deckhand/Passphrase/v1
name: osh_nova_test_password
path: .
- dest:
path: .values.endpoints.identity.auth.neutron.password
src:
schema: deckhand/Passphrase/v1
name: osh_neutron_password
path: .
- dest:
path: .values.endpoints.identity.auth.placement.password
src:
schema: deckhand/Passphrase/v1
name: osh_placement_password
path: .
- dest:
path: .values.endpoints.identity.auth.ironic.password
src:
schema: deckhand/Passphrase/v1
name: osh_ironic_password
path: .
- dest:
path: .values.endpoints.oslo_messaging.auth.admin.password
src:
schema: deckhand/Passphrase/v1
name: osh_oslo_messaging_admin_password
path: .
- dest:
path: .values.endpoints.oslo_messaging.auth.placement.password
src:
schema: deckhand/Passphrase/v1
name: osh_nova_oslo_messaging_password
path: .
- dest:
path: .values.endpoints.oslo_db.auth.placement.password
src:
schema: deckhand/Passphrase/v1
name: osh_nova_oslo_db_password
path: .
- dest:
path: .values.endpoints.oslo_db.auth.admin.password
src:
schema: deckhand/Passphrase/v1
name: osh_oslo_db_admin_password
path: .
- dest:
path: .values.endpoints.oslo_cache.auth.memcache_secret_key
src:
schema: deckhand/Passphrase/v1
name: osh_oslo_cache_secret_key
path: .
- dest:
path: .values.endpoints.oslo_db.auth.nova_api.password
src:
schema: deckhand/Passphrase/v1
name: osh_nova_oslo_db_password
path: .
- dest:
path: .values.endpoints.oslo_db.auth.nova_api.username
src:
schema: pegleg/AccountCatalogue/v1
name: osh_service_accounts
path: .osh.nova.oslo_db.username
data:
chart_name: placement
release: placement
namespace: openstack
wait:
timeout: 2700
labels:
release_group: clcp-placement
resources:
- type: job
- type: deployment
min_ready: 100%
native:
enabled: false
test:
timeout: 600
install:
no_hooks: false
upgrade:
no_hooks: false
pre:
delete:
- type: job
labels:
release_group: clcp-placement
post:
create: []
values:
manifests:
certificates: false
job_db_migrate: false
dependencies:
static:
rabbit_init:
services:
- endpoint: internal
service: oslo_messaging
jobs:
- clcp-openstack-rabbitmq-cluster-wait
db_sync:
jobs:
- placement-db-init
labels:
job:
node_selector_key: openstack-control-plane
node_selector_value: enabled
api:
node_selector_key: openstack-control-plane
node_selector_value: enabled
test:
node_selector_key: openstack-control-plane
node_selector_value: enabled
pod:
mandatory_access_control:
type: apparmor
placement-api:
placement-api: runtime/default
init: runtime/default
placement-db-migrate:
init: runtime/default
placement-mysql-migration: runtime/default
replicas:
api: 4
affinity:
anti:
type:
placement: requiredDuringSchedulingIgnoredDuringExecution
weight:
default: 100
lifecycle:
upgrades:
deployments:
pod_replacement_strategy: RollingUpdate
rolling_update:
max_unavailable: 50%
security_context:
placement:
container:
placement_api:
allowPrivilegeEscalation: false
network:
api:
ingress:
annotations:
nginx.ingress.kubernetes.io/backend-protocol: "https"
nginx.ingress.kubernetes.io/configuration-snippet: |
more_set_headers "X-XSS-Protection: 1; mode=block";
more_set_headers "X-Frame-Options: deny";
if ($request_method !~ ^(HEAD|GET|POST|PUT|PATCH|DELETE)$ ) {
return 405;
}
conf:
logging:
loggers:
keys:
- root
- placement
- oslo.messaging
handlers:
keys:
- stdout
- stderr
- "null"
formatters:
keys:
- context
- default
logger_root:
level: WARNING
handlers: "null"
logger_placement:
level: INFO
handlers:
- stdout
qualname: placement
logger_oslo.messaging:
level: INFO
handlers:
- stdout
qualname: oslo.messaging
logger_amqp:
level: WARNING
handlers: stderr
qualname: amqp
logger_amqplib:
level: WARNING
handlers: stderr
qualname: amqplib
logger_eventletwsgi:
level: WARNING
handlers: stderr
qualname: eventlet.wsgi.server
logger_sqlalchemy:
level: WARNING
handlers: stderr
qualname: sqlalchemy
logger_boto:
level: WARNING
handlers: stderr
qualname: boto
handler_null:
class: logging.NullHandler
formatter: default
args: ()
handler_stdout:
class: StreamHandler
args: (sys.stdout,)
formatter: context
handler_stderr:
class: StreamHandler
args: (sys.stderr,)
formatter: context
formatter_context:
class: oslo_log.formatters.ContextFormatter
formatter_default:
format: "%(message)s"
policy:
"context_is_admin": "role:admin"
"admin_or_owner": "rule:context_is_admin or project_id:%(project_id)s"
"default": "rule:admin_or_owner"
"admin_api": "role:admin"
"placement:resource_providers:list": "rule:admin_api"
"placement:resource_providers:create": "rule:admin_api"
"placement:resource_providers:show": "rule:admin_api"
"placement:resource_providers:update": "rule:admin_api"
"placement:resource_providers:delete": "rule:admin_api"
"placement:resource_classes:list": "rule:admin_api"
"placement:resource_classes:create": "rule:admin_api"
"placement:resource_classes:show": "rule:admin_api"
"placement:resource_classes:update": "rule:admin_api"
"placement:resource_classes:delete": "rule:admin_api"
"placement:resource_providers:inventories:list": "rule:admin_api"
"placement:resource_providers:inventories:create": "rule:admin_api"
"placement:resource_providers:inventories:show": "rule:admin_api"
"placement:resource_providers:inventories:update": "rule:admin_api"
"placement:resource_providers:inventories:delete": "rule:admin_api"
"placement:resource_providers:aggregates:list": "rule:admin_api"
"placement:resource_providers:aggregates:update": "rule:admin_api"
"placement:resource_providers:usages": "rule:admin_api"
"placement:usages": "rule:admin_api"
"placement:traits:list": "rule:admin_api"
"placement:traits:show": "rule:admin_api"
"placement:traits:update": "rule:admin_api"
"placement:traits:delete": "rule:admin_api"
"placement:resource_providers:traits:list": "rule:admin_api"
"placement:resource_providers:traits:update": "rule:admin_api"
"placement:resource_providers:traits:delete": "rule:admin_api"
"placement:allocations:manage": "rule:admin_api"
"placement:allocations:list": "rule:admin_api"
"placement:allocations:update": "rule:admin_api"
"placement:allocations:delete": "rule:admin_api"
"placement:resource_providers:allocations:list": "rule:admin_api"
"placement:allocation_candidates:list": "rule:admin_api"
"placement:reshaper:reshape": "rule:admin_api"
"not_implemented_in_aic": '!'
placement:
DEFAULT:
debug: false
dependencies:
- os-placement-htk
...
---
schema: armada/Chart/v1
metadata:
schema: metadata/Document/v1
name: os-placement-htk
layeringDefinition:
abstract: false
layer: global
substitutions:
- src:
schema: pegleg/SoftwareVersions/v1
name: software-versions
path: .charts.osh.placement-htk
dest:
path: .source
storagePolicy: cleartext
data:
chart_name: os-placement-htk
release: os-placement-htk
namespace: os-placement-htk
timeout: 600
wait:
timeout: 600
upgrade:
no_hooks: true
values: {}
dependencies: []
...

10
global/software/charts/ucp/ceph/ceph-client-update.yaml
View File

@ -123,13 +123,13 @@ data:
enabled: true
script: |
set -x
DESIRED_VERSION="octopus"
DESIRED_VERSION="nautilus"
ADDITIONAL_VERSIONS=1
while [ $ADDITIONAL_VERSIONS -gt 0 ]; do
sleep 5
ADDITIONAL_VERSIONS=$(ceph tell osd.* version --format json | awk -F 'osd.[0-9]*: ' '/^osd/ { print $2}' | jq -r '.release' | uniq | grep -v ${DESIRED_VERSION} | wc -l )
ADDITIONAL_VERSIONS=$(ceph tell osd.* version --format json | awk -F 'osd.[0-9]*: ' '/^osd/ { print $2}' | jq -r '.version' | awk '{ print $(NF-1) }' | uniq | grep -v ${DESIRED_VERSION} | wc -l )
done
while [[ `ceph pg stat -f json | jq -r ".pg_summary.num_pgs"` -eq 0 ]] || [[ `ceph pg ls -f json | jq -r '.pg_stats[].state' | grep -v "active"` ]]
while [[ `ceph pg ls | tail -n +2 | grep -v "active+\|NOTE"` ]]
do
sleep 5
done
@ -239,9 +239,7 @@ data:
features:
# NOTE(st053q): If autoscaler is disabled, then
# mon_pg_warn_max_object_skew should not be 0 in ceph.conf
pg_autoscaler: true
cluster_flags:
unset: "noup"
pg_autoscaler: false
pool:
spec:
# Health metrics pool

3
global/software/charts/ucp/ceph/ceph-client.yaml
View File

@ -93,6 +93,7 @@ data:
component: test
test:
enabled: true
timeout: 3600
values:
labels:
job:
@ -211,8 +212,6 @@ data:
conf:
features:
pg_autoscaler: false
cluster_flags:
set: "noup"
pool:
spec:
# Health metrics pool

4
global/software/config/endpoints.yaml
View File

@ -256,6 +256,10 @@ data:
podport: 10283
status:
podport: 18089
stream:
podport: 18090
profiler:
podport: 18088
kubernetesprovisioner:
name: promenade
hosts:

157
global/software/config/versions.yaml
View File

@ -201,7 +201,7 @@ data:
type: git
cinder-htk:
location: https://opendev.org/openstack/openstack-helm-infra
reference: 3dd0eb0cdf54387447f07a4ec6be9582c457a1a8
reference: 2dc83fdde7d9a7efe378730e480efbdbdde997db
subpath: helm-toolkit
type: git
glance:
@ -211,7 +211,7 @@ data:
type: git
glance-htk:
location: https://opendev.org/openstack/openstack-helm-infra
reference: 3dd0eb0cdf54387447f07a4ec6be9582c457a1a8
reference: 2dc83fdde7d9a7efe378730e480efbdbdde997db
subpath: helm-toolkit
type: git
heat:
@ -221,7 +221,7 @@ data:
type: git
heat-htk:
location: https://opendev.org/openstack/openstack-helm-infra
reference: 3dd0eb0cdf54387447f07a4ec6be9582c457a1a8
reference: 2dc83fdde7d9a7efe378730e480efbdbdde997db
subpath: helm-toolkit
type: git
helm_toolkit:
@ -236,7 +236,7 @@ data:
type: git
horizon-htk:
location: https://opendev.org/openstack/openstack-helm-infra
reference: 3dd0eb0cdf54387447f07a4ec6be9582c457a1a8
reference: 2dc83fdde7d9a7efe378730e480efbdbdde997db
subpath: helm-toolkit
type: git
ingress:
@ -251,7 +251,7 @@ data:
type: git
keystone:
location: https://opendev.org/openstack/openstack-helm
reference: 28d0a56e46129276559a4ddb2dea32c35b10b58e
reference: d467d685a3863edc5fed7c352961b3235a5e3a99
subpath: keystone
type: git
keystone-htk:
@ -266,7 +266,7 @@ data:
type: git
libvirt-htk:
location: https://opendev.org/openstack/openstack-helm-infra
reference: 3dd0eb0cdf54387447f07a4ec6be9582c457a1a8
reference: 2dc83fdde7d9a7efe378730e480efbdbdde997db
subpath: helm-toolkit
type: git
mariadb:
@ -276,7 +276,7 @@ data:
type: git
mariadb-htk:
location: https://opendev.org/openstack/openstack-helm-infra
reference: b482b57e6ea85eceef02787cb2e8eb884cceb80c
reference: 2dc83fdde7d9a7efe378730e480efbdbdde997db
subpath: helm-toolkit
type: git
memcached:
@ -296,17 +296,17 @@ data:
type: git
neutron-htk:
location: https://opendev.org/openstack/openstack-helm-infra
reference: 4f30b1361e2b596ce8760fd593f08d4f9a6639fe
reference: 2dc83fdde7d9a7efe378730e480efbdbdde997db
subpath: helm-toolkit
type: git
nova:
location: https://opendev.org/openstack/openstack-helm
reference: 4aa7a3026706758d22dc3e7002a2a0bffcfd84ea
reference: 2ec17153c6cb918dd357f71824ec59dd0d74dfba
subpath: nova
type: git
nova-htk:
location: https://opendev.org/openstack/openstack-helm-infra
reference: 017c8df602cbe33ae3e70a7125ee94886136e850
reference: 2dc83fdde7d9a7efe378730e480efbdbdde997db
subpath: helm-toolkit
type: git
openvswitch:
@ -316,17 +316,27 @@ data:
type: git
openvswitch-htk:
location: https://opendev.org/openstack/openstack-helm-infra
reference: d0b32ed88ad652d9c2226466a13bac8b28038399
reference: f08d30df6b871044135534eedf76c8f2760d9923
subpath: helm-toolkit
type: git
placement:
location: https://opendev.org/openstack/openstack-helm
reference: 2ec17153c6cb918dd357f71824ec59dd0d74dfba
subpath: placement
type: git
placement-htk:
location: https://opendev.org/openstack/openstack-helm-infra
reference: 2dc83fdde7d9a7efe378730e480efbdbdde997db
subpath: helm-toolkit
type: git
rabbitmq:
location: https://opendev.org/openstack/openstack-helm-infra
reference: 1a8536fd5d9c3c05a0c4b5cd0e6e4a502c9c53bc
reference: 5c8bd68e764b22122d6be4cbda04cfdc76223b23
subpath: rabbitmq
type: git
rabbitmq-htk:
location: https://opendev.org/openstack/openstack-helm-infra
reference: 832718629f3d967c0bca7f28c53f57cd5ad4ddaa
reference: 2dc83fdde7d9a7efe378730e480efbdbdde997db
subpath: helm-toolkit
type: git
tempest:
@ -352,12 +362,12 @@ data:
type: git
mariadb:
location: https://opendev.org/openstack/openstack-helm-infra
reference: ba601e0cba1bb584fe3bce07f96f8e5b98b12889
reference: 6dd39da6ad7ffd744ecff423e99637aadd9c0414
subpath: mariadb
type: git
mariadb-htk:
location: https://opendev.org/openstack/openstack-helm-infra
reference: a4568f31e2e9d09c8f318a9d938c9a16f0da59ef
reference: 2dc83fdde7d9a7efe378730e480efbdbdde997db
subpath: helm-toolkit
type: git
mini-mirror:
@ -403,7 +413,7 @@ data:
osh_infra:
ceph-rgw:
location: https://opendev.org/openstack/openstack-helm-infra
reference: 20cf2db961a05285a751b3bc96b8fa4e51e3b412
reference: eacf93722136636dcfbd2b68c59b71f071ffc085
subpath: ceph-rgw
type: git
ceph-rgw-htk:
@ -413,17 +423,17 @@ data:
type: git
elasticsearch:
location: https://opendev.org/openstack/openstack-helm-infra
reference: a2c1eea8a982de777fa430efdf188d556630f3f0
reference: fd4bf572111b75f1a73396c6d3b714259b53a024
subpath: elasticsearch
type: git
elasticsearch-htk:
location: https://opendev.org/openstack/openstack-helm-infra
reference: a78ee39dcb9209a4ba6cc87f2989481a9fa63fc1
reference: 2dc83fdde7d9a7efe378730e480efbdbdde997db
subpath: helm-toolkit
type: git
fluentd:
location: https://opendev.org/openstack/openstack-helm-infra
reference: 59164428d305bf72dd67733a184266fd1217c153
reference: ddd5a74319142b14d42271da6727e76637133869
subpath: fluentd
type: git
fluentd-htk:
@ -433,22 +443,22 @@ data:
type: git
grafana:
location: https://opendev.org/openstack/openstack-helm-infra
reference: 128c3f748aee3ae72cccca0ff17a71ac1ed5c2fb
reference: 87e3a02dd558dfca6a9a8f49feb34f47d516cbf7
subpath: grafana
type: git
grafana-htk:
location: https://opendev.org/openstack/openstack-helm-infra
reference: a78ee39dcb9209a4ba6cc87f2989481a9fa63fc1
reference: 2dc83fdde7d9a7efe378730e480efbdbdde997db
subpath: helm-toolkit
type: git
kibana:
location: https://opendev.org/openstack/openstack-helm-infra
reference: b62a46336c1b6ca86e48710ba85c9320f3075fd5
reference: 9a719e2a18bfd4f1daa57d1a4397d89966653b18
subpath: kibana
type: git
kibana-htk:
location: https://opendev.org/openstack/openstack-helm-infra
reference: a78ee39dcb9209a4ba6cc87f2989481a9fa63fc1
reference: 2dc83fdde7d9a7efe378730e480efbdbdde997db
subpath: helm-toolkit
type: git
local-storage:
@ -488,7 +498,7 @@ data:
type: git
prometheus-htk:
location: https://opendev.org/openstack/openstack-helm-infra
reference: a78ee39dcb9209a4ba6cc87f2989481a9fa63fc1
reference: 2dc83fdde7d9a7efe378730e480efbdbdde997db
subpath: helm-toolkit
type: git
prometheus_kube_state_metrics:
@ -549,7 +559,7 @@ data:
type: git
armada-htk:
location: https://opendev.org/openstack/openstack-helm-infra
reference: 926348fe2476051f9ca825916db333f81c0139b7
reference: 44947cc80b91510da6f68a434c847af2d260cabd
subpath: helm-toolkit
type: git
barbican:
@ -559,12 +569,12 @@ data:
type: git
barbican-htk:
location: https://opendev.org/openstack/openstack-helm-infra
reference: c2ece6a45aea1a4d52942eeba23b5d37de70c082
reference: 2b20674cad133581e1259ac87470ba0f6cca313b
subpath: helm-toolkit
type: git
ceph-client:
location: https://opendev.org/openstack/openstack-helm-infra
reference: dd39a0f7e08c9eee861b9fa23e9587d440b76c43
reference: 8d9b7fdd2b146dc8a1578d6ee23c79aa3116f87e
subpath: ceph-client
type: git
ceph-htk:
@ -574,22 +584,22 @@ data:
type: git
ceph-mon:
location: https://opendev.org/openstack/openstack-helm-infra
reference: 4eee89ccba75a34b222d2f828129d0d5f26ffd23
reference: 8d9b7fdd2b146dc8a1578d6ee23c79aa3116f87e
subpath: ceph-mon
type: git
ceph-osd:
location: https://opendev.org/openstack/openstack-helm-infra
reference: 4ed24de14b562607742a246906b48fba647d3ce8
reference: 8d9b7fdd2b146dc8a1578d6ee23c79aa3116f87e
subpath: ceph-osd
type: git
ceph-provisioners:
location: https://opendev.org/openstack/openstack-helm-infra
reference: 4ed24de14b562607742a246906b48fba647d3ce8
reference: 8d9b7fdd2b146dc8a1578d6ee23c79aa3116f87e
subpath: ceph-provisioners
type: git
ceph-rgw:
location: https://opendev.org/openstack/openstack-helm-infra
reference: 20cf2db961a05285a751b3bc96b8fa4e51e3b412
reference: 2f8ea3977ba31a4576ffb9bf98282d0586d1aa25
subpath: ceph-rgw
type: git
deckhand:
@ -599,7 +609,7 @@ data:
type: git
deckhand-htk:
location: https://opendev.org/openstack/openstack-helm-infra
reference: 926348fe2476051f9ca825916db333f81c0139b7
reference: 8b09a074232fd1abff26055fd975ce742bc7d71b
subpath: helm-toolkit
type: git
divingbell:
@ -619,7 +629,7 @@ data:
type: git
drydock-htk:
location: https://opendev.org/openstack/openstack-helm-infra
reference: 926348fe2476051f9ca825916db333f81c0139b7
reference: 9061d08a5e41a94fd92e60d860bfa7464d2a3cb5
subpath: helm-toolkit
type: git
ingress:
@ -634,7 +644,7 @@ data:
type: git
keystone:
location: https://opendev.org/openstack/openstack-helm
reference: 28d0a56e46129276559a4ddb2dea32c35b10b58e
reference: d467d685a3863edc5fed7c352961b3235a5e3a99
subpath: keystone
type: git
keystone-htk:
@ -649,7 +659,7 @@ data:
type: git
maas-htk:
location: https://opendev.org/openstack/openstack-helm-infra
reference: d0f808a64e2b0340aeefcfc4c6107bc825a9fc99
reference: d96b724310252c259041c216e1c110062e506347
subpath: helm-toolkit
type: git
mariadb:
@ -659,7 +669,7 @@ data:
type: git
mariadb-htk:
location: https://opendev.org/openstack/openstack-helm-infra
reference: f08d30df6b871044135534eedf76c8f2760d9923
reference: 2dc83fdde7d9a7efe378730e480efbdbdde997db
subpath: helm-toolkit
type: git
memcached:
@ -679,12 +689,12 @@ data:
type: git
postgresql-htk:
location: https://opendev.org/openstack/openstack-helm-infra
reference: 4a770bb90846e7bd5fd32be4fcbce95b4218be01
reference: 25aa3690252c605d237c187524d0adf73a8424e5
subpath: helm-toolkit
type: git
promenade:
location: https://opendev.org/airship/promenade
reference: 27f181a9d30294030d695b747b2e4560ffbd29be
reference: d161528ae8de0dcb0dd9d39bc370f85f2aa1c462
subpath: charts/promenade
type: git
promenade-htk:
@ -709,12 +719,12 @@ data:
type: git
shipyard-htk:
location: https://opendev.org/openstack/openstack-helm-infra
reference: 926348fe2476051f9ca825916db333f81c0139b7
reference: b50fae62a4ad0992ce877cd632800e1eed5f71a9
subpath: helm-toolkit
type: git
tenant-ceph-client:
location: https://opendev.org/openstack/openstack-helm-infra
reference: dd39a0f7e08c9eee861b9fa23e9587d440b76c43
reference: 8d9b7fdd2b146dc8a1578d6ee23c79aa3116f87e
subpath: ceph-client
type: git
tenant-ceph-htk:
@ -724,22 +734,22 @@ data:
type: git
tenant-ceph-mon:
location: https://opendev.org/openstack/openstack-helm-infra
reference: 4eee89ccba75a34b222d2f828129d0d5f26ffd23
reference: 8d9b7fdd2b146dc8a1578d6ee23c79aa3116f87e
subpath: ceph-mon
type: git
tenant-ceph-osd:
location: https://opendev.org/openstack/openstack-helm-infra
reference: 4ed24de14b562607742a246906b48fba647d3ce8
reference: 8d9b7fdd2b146dc8a1578d6ee23c79aa3116f87e
subpath: ceph-osd
type: git
tenant-ceph-provisioners:
location: https://opendev.org/openstack/openstack-helm-infra
reference: 4ed24de14b562607742a246906b48fba647d3ce8
reference: 8d9b7fdd2b146dc8a1578d6ee23c79aa3116f87e
subpath: ceph-provisioners
type: git
tenant-ceph-rgw:
location: https://opendev.org/openstack/openstack-helm-infra
reference: 20cf2db961a05285a751b3bc96b8fa4e51e3b412
reference: 2f8ea3977ba31a4576ffb9bf98282d0586d1aa25
subpath: ceph-rgw
type: git
tiller:
@ -832,11 +842,12 @@ data:
busybox: &busybox docker.io/busybox:1.28.3
alpine-38: &alpine-38 docker.io/alpine:3.8
airflow: &airflow quay.io/airshipit/airflow:f0f876afef07f62cd38fbce8b775cfc741e0bf52-ubuntu_xenial
armada: &armada quay.io/airshipit/armada:7ef4b8643b5ec5216a8f6726841e156c0aa54a1a-ubuntu_bionic
#armada: &armada quay.io/airshipit/armada:7ef4b8643b5ec5216a8f6726841e156c0aa54a1a-ubuntu_bionic
armada: &armada quay.io/airshipit/armada:b37417253f99f23549e09502e3bcd81d450bb4c4-ubuntu_bionic
barbican: &barbican docker.io/openstackhelm/barbican@sha256:4c44bb9e5d29224007b2ef52c1ce4ff756e655efe9c6e9a95b2e98f4f501499e
#ceph_daemon: &ceph_daemon docker.io/openstackhelm/ceph-daemon:ubuntu_bionic-20191216
ceph_daemon: &ceph_daemon docker.io/openstackhelm/ceph-daemon:ubuntu_bionic-20210902
ceph_daemon: &ceph_daemon docker.io/openstackhelm/ceph-daemon:ubuntu_bionic-20200521
ceph-utility: &ceph-utility quay.io/airshipit/porthole-ceph-utility:e7a6644b3af8bddd94d20ca35f388ae605203416-ubuntu_bionic
@ -855,15 +866,15 @@ data:
curator: &curator docker.io/bobrik/curator:5.8.1
deckhand: &deckhand quay.io/airshipit/deckhand:90f653bc0fa9f2c910d05a3c00d2c339c064638d-ubuntu_xenial
deckhand: &deckhand quay.io/airshipit/deckhand:5cd799cc5d04527ac782270008ff647b3779ff05-ubuntu_bionic
dep_check: &dep_check quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
dep_check: &dep_check quay.io/airshipit/kubernetes-entrypoint:v1.0.0
drydock: &drydock quay.io/airshipit/drydock:dfe7c0508d27f517bf29cd2f37b7f07b112edb4e
drydock: &drydock quay.io/airshipit/drydock:aa0cf8c8d09ad37b8ebcce677064e1b3b2211758-ubuntu_bionic
elasticsearch: &elasticsearch docker.io/openstackhelm/elasticsearch-s3:7_1_0-20191119
etcd: &etcd quay.io/coreos/etcd:v3.4.8
etcd: &etcd quay.io/coreos/etcd:v3.4.15
etcdctl: &etcdctl-utility quay.io/airshipit/porthole-etcdctl-utility:e7a6644b3af8bddd94d20ca35f388ae605203416-ubuntu_bionic
@ -889,35 +900,34 @@ data:
ingress_error_pages_404: &ingress_error_pages_404 gcr.io/google-containers/ingress-gce-404-server-with-metrics-amd64:v1.6.0@sha256:d83d8a481145d0eb71f8bd71ae236d1c6a931dd3bdcaf80919a8ec4a4d8aff74
ingress_controller_mariadb: &ingress_controller_mariadb quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.32.0
ingress_controller_mariadb: &ingress_controller_mariadb k8s.gcr.io/ingress-nginx/controller:v0.48.1
k8s-keystone-auth: &k8s-keystone-auth docker.io/k8scloudprovider/k8s-keystone-auth:v1.18.0
kibana: &kibana docker.elastic.co/kibana/kibana-oss:7.9.2
kibana: &kibana docker.elastic.co/kibana/kibana-oss:7.1.0
libvirt: &libvirt docker.io/openstackhelm/libvirt:ubuntu_bionic-20210227
mariadb_db: &mariadb_db docker.io/openstackhelm/mariadb:10.2.18
mariadb_db: &mariadb_db docker.io/openstackhelm/mariadb:ubuntu_xenial-20200811
maas_rack_controller: &maas_rack_controller quay.io/airshipit/maas-rack-controller:840b482373df163ba088b91c278f2a58fd599b7b
maas_rack_controller: &maas_rack_controller quay.io/airshipit/maas-rack-controller:94e55069dc17606e0c3b585d7e901ee0bf372f29
maas_region_controller: &maas_region_controller quay.io/airshipit/maas-region-controller:840b482373df163ba088b91c278f2a58fd599b7b
maas_region_controller: &maas_region_controller quay.io/airshipit/maas-region-controller:94e55069dc17606e0c3b585d7e901ee0bf372f29
maas_ingress: &maas_ingress docker-prod-local.artifactory.mirantis.com/mirantis/kubernetes-ingress-nginx/nginx-ingress-controller-amd64@sha256:fe510f97b02566e21685b7b108422370ca67a8a44099ce7e968a778c0ba06e0b
memcached: &memcached docker.io/library/memcached:1.6.6-alpine
#mos_cinder: &mos_cinder openstackhelm/cinder:stein-ubuntu_bionic-20200513
mos_cinder: &mos_cinder docker.io/openstackhelm/cinder:train-ubuntu_bionic-20200612
mos_cinder_storage_init: &mos_cinder_storage_init docker.io/openstackhelm/ceph-config-helper:ubuntu_bionic-20200416
mos_cinder_storage_init: &mos_cinder_storage_init docker.io/openstackhelm/ceph-config-helper:ubuntu_bionic-20220603
#mos_glance: &mos_glance openstackhelm/glance:stein-ubuntu_bionic-20200513
mos_glance: &mos_glance docker.io/openstackhelm/glance:train-ubuntu_bionic-20200612
#mos_heat: &mos_heat docker.io/deepakdt/heat:stein-ubuntu_bionic-taas
mos_heat: &mos_heat docker.io/openstackhelm/heat:train-ubuntu_bionic-20200612
mos_heat: &mos_heat docker.io/openstackhelm/heat:stein-ubuntu_bionic
mos_heat_nova: &mos_heat_nova docker.io/openstackhelm/heat:train-ubuntu_bionic-20200612
mos_horizon: &mos_horizon docker.io/openstackhelm/horizon:train-ubuntu_bionic-20200612
mos_horizon: &mos_horizon docker.io/openstackhelm/horizon:train-ubuntu_bionic
mos_keystone: &mos_keystone docker.io/openstackhelm/keystone:train-ubuntu_bionic-20200612
#mos_neutron: &mos_neutron docker.io/imarijitbose/stein_neutron_bionic
@ -933,22 +943,25 @@ data:
nova_spiceproxy: &nova_spiceproxy docker.io/openstackhelm/nova:train-ubuntu_bionic-20200612
#openvswitch: &openvswitch docker.io/deepakdt/openvswitch:ovs2.11.1-dpdk18.11.3-ubuntu_bionic-dpdk
openvswitch: &openvswitch docker.io/openstackhelm/openvswitch:ubuntu_bionic-20200722
openvswitch: &openvswitch docker.io/openstackhelm/openvswitch:ubuntu_bionic-dpdk-20220725
openstack-utility: &openstack-utility quay.io/airshipit/porthole-openstack-utility:e7a6644b3af8bddd94d20ca35f388ae605203416-ubuntu_bionic
pegleg: &pegleg quay.io/airshipit/pegleg@sha256:0ca3b708c37425e4e05627443dbd39d2ed27cf06193d2cc3bcb5b985b260d79d
mos_placement: &mos_placement docker.io/openstackhelm/placement:periodic_train-ubuntu_bionic-20220309
nc-swissknife: &nc-swissknife quay.io/airshipit/pegleg@sha256:0ca3b708c37425e4e05627443dbd39d2ed27cf06193d2cc3bcb5b985b260d79d
patroni: &patroni docker-prod-local.artifactory.mirantis.com/nc/patroni:9.6.15-bionic-1567439806207
postgres: &postgres docker-prod-local.artifactory.mirantis.com/nc/postgresql:9.6.15-debian-1566552796302
postgres: &postgres docker.io/postgres:9.6
promenade: &promenade quay.io/airshipit/promenade:b65930f205b77f28507dee9296aead00e24f2a18
divingbell: &divingbell docker.io/ubuntu:16.04
prometheus: &prometheus docker.io/prom/prometheus:v2.12.0
prometheus_elasticsearch_exporter: &prometheus_elasticsearch_exporter docker.io/justwatch/elasticsearch_exporter:1.0.1
prometheus_elasticsearch_exporter: &prometheus_elasticsearch_exporter docker.io/justwatch/elasticsearch_exporter:1.1.0
prometheus_fluentd_exporter: &prometheus_fluentd_exporter docker.io/bitnami/fluentd-exporter:0.2.0
prometheus_memcached_exporter: &prometheus_memcached_exporter docker.io/prom/memcached-exporter:v0.4.1
prometheus_mysql_exporter: &prometheus_mysql_exporter docker.io/prom/mysqld-exporter:v0.10.0
@ -958,12 +971,12 @@ data:
rabbitmq_mgmt: &rabbitmq_mgmt docker.io/library/rabbitmq:3.7.15-management
rabbitmq: &rabbitmq docker.io/library/rabbitmq:3.7.15
rabbitmq_exporter: &rabbitmq_exporter docker.io/kbudde/rabbitmq-exporter:v1.0.0-RC7.1
rally_test: &rally_test docker.io/xrally/xrally-openstack:1.3.0
rally_test: &rally_test docker.io/xrally/xrally-openstack:2.0.0
#rbd_provisioner: &rbd_provisioner docker.io/openstackhelm/ceph-rbd-provisioner:ubuntu_bionic-20191216
rbd_provisioner: &rbd_provisioner docker.io/openstackhelm/ceph-rbd-provisioner:ubuntu_bionic-20200521
selenium_tests: &selenium_tests docker.io/openstackhelm/osh-selenium:ubuntu_bionic-20191017
shipyard: &shipyard quay.io/airshipit/shipyard:0b29f89d3fc284fe483c58f102574c687034468d-ubuntu_xenial
sstream_cache: &sstream_cache quay.io/airshipit/sstream-cache:03ebbaaca3f38ab49a5993b506761a4abfd19d89
sstream_cache: &sstream_cache quay.io/airshipit/sstream-cache:3accf71685ed980ed8c5c07fd8c59306c012dcd2
#storage_init: &storage_init docker.io/openstackhelm/ceph-config-helper:ubuntu_bionic-20191216
storage_init: &storage_init docker.io/openstackhelm/ceph-config-helper:ubuntu_bionic-20200521
@ -985,7 +998,7 @@ data:
kubernetes_test: &kubernetes_test docker.io/python:3.6
kubernetes_pause: &kubernetes_pause gcr.io/google_containers/pause-amd64:3.1
grafana: &grafana docker.io/grafana/grafana:6.2.0
grafana: &grafana docker.io/grafana/grafana:7.3.6
# TODO: Move this under the images_refs.images header for consistency
keystone: &ref_keystone
@ -1309,6 +1322,15 @@ data:
openvswitch_db_server: *openvswitch
openvswitch_vswitchd: *openvswitch
dep_check: *dep_check
placement:
bootstrap: *mos_heat
<<: *ref_keystone
db_migrate: *mos_placement
db_drop: *mos_heat
db_init: *mos_heat
dep_check: *dep_check
placement: *mos_placement
placement_db_sync: *mos_placement
rabbitmq:
prometheus_rabbitmq_exporter: *rabbitmq_exporter
prometheus_rabbitmq_exporter_helm_tests: *mos_heat
@ -1722,7 +1744,7 @@ data:
- main
gpgkey: ""
named:
runtime: containerd=1.5.2-0ubuntu1~18.04.2
runtime: containerd=1.5.5-0ubuntu3~18.04.2
socat: socat
unnamed:
- bsd-mailx
@ -1744,5 +1766,6 @@ data:
# NC release to reboot the nodes after the completion of the Shipyard site-update. In
# the MOP update, you should also link to the following wiki page:
# https://wiki.web.att.com/display/CCPdev/i40e+Driver+upgrades
location: https://netactuate.dl.sourceforge.net/project/e1000/i40e%20stable/2.12.6/i40e-2.12.6.tar.gz
#location: https://netactuate.dl.sourceforge.net/project/e1000/i40e%20stable/2.12.6/i40e-2.12.6.tar.gz
location: https://sourceforge.net/projects/e1000/files/unsupported/i40e%20unsupported/i40e-2.12.6.3/i40e-2.12.6.3.tar.gz
...

2
type/cruiser/software/charts/ucp/core/scaled-charts.yaml
View File

@ -87,5 +87,5 @@ data:
values:
pod:
replicas:
server: 3
server: 1
...

1
type/cruiser/software/config/endpoints.yaml
View File

@ -285,6 +285,7 @@ data:
default: 8088
public: 443
oslo_db:
namespace: openstack
hosts:
default: mariadb
discovery: mariadb-discovery

23
type/cruiser/software/config/service_accounts.yaml
View File

@ -32,6 +32,8 @@ metadata:
- path: .osh.nova.nova.region_name
- path: .osh.nova.test.region_name
- path: .osh.nova.placement.region_name
- path: .osh.placement.placement.region_name
- path: .osh.placement.test.region_name
- path: .osh.barbican.barbican.region_name
- path: .osh.horizon.admin.region_name
data:
@ -159,6 +161,25 @@ data:
oslo_messaging:
neutron:
username: neutron-rabbitmq-user
placement:
placement:
role: admin
username: placement
project_name: service
user_domain_name: default
project_domain_name: default
test:
role: admin
username: placement-test
project_name: test
user_domain_name: service
project_domain_name: service
oslo_db:
username: placement
database: placement
oslo_messaging:
placement:
username: placement-rabbitmq-user
nova:
nova:
role: admin
@ -190,6 +211,8 @@ data:
oslo_messaging:
nova:
username: nova-rabbitmq-user
placement:
username: nova-rabbitmq-user
horizon:
admin:
username: admin