airship
/
treasuremap
Code Issues Proposed changes

Switch mariadb to primary service 

Change-Id: Ifd19a7cfc533c930d627b22f20de6668efa63037
This commit is contained in:
Sergiy Markin 2024-02-05 22:26:04 +00:00
parent c70320aa26
commit 01d80e18d8
7 changed files with 39 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.zuul.yaml
View File

@ -182,9 +182,9 @@
vars:
site: airskiff
HELM_ARTIFACT_URL: https://get.helm.sh/helm-v3.12.2-linux-amd64.tar.gz
HTK_COMMIT: ae91cf3fc3f288b6d92ace4a3a405606a653638f
OSH_INFRA_COMMIT: db3537e56b182a54e7f6931ce57e2a190714019b
OSH_COMMIT: 75c30f43db44218e7842611e880fd8d7a30fa79c
HTK_COMMIT: cfff60ec10a6c386f38db79bb9f59a552c2b032f
OSH_INFRA_COMMIT: cfff60ec10a6c386f38db79bb9f59a552c2b032f
OSH_COMMIT: 2d9457e34ca4200ed631466bd87569b0214c92e7
irrelevant-files:
- ^.*\.rst$
- ^doc/.*$

12
global/software/charts/osh-infra/osh-infra-mariadb/mariadb.yaml
View File

@ -95,6 +95,14 @@ data:
monitoring:
prometheus:
enabled: true
dependencies:
- osh-helm-toolkit
conf:
galera:
cluster_leader_ttl: 60
manifests:
deployment_ingress: false
deployment_error: false
service_ingress: false
configmap_ingress_conf: false
configmap_ingress_etc: false
service_error: false
...

10
global/software/charts/osh/openstack-mariadb/mariadb.yaml
View File

@ -97,4 +97,14 @@ data:
monitoring:
prometheus:
enabled: true
conf:
galera:
cluster_leader_ttl: 60
manifests:
deployment_ingress: false
deployment_error: false
service_ingress: false
configmap_ingress_conf: false
configmap_ingress_etc: false
service_error: false
...

10
global/software/charts/ucp/core/mariadb.yaml
View File

@ -80,4 +80,14 @@ data:
error_server:
node_selector_key: ucp-control-plane
node_selector_value: enabled
conf:
galera:
cluster_leader_ttl: 60
manifests:
deployment_ingress: false
deployment_error: false
service_ingress: false
configmap_ingress_conf: false
configmap_ingress_etc: false
service_error: false
...

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

@ -17,7 +17,7 @@ data:
type: tar
controller-manager:
location: http://control-plane.minikube.internal:8282/controller_manager.tgz
subpath: controller_managerin
subpath: controller_manager
type: tar
coredns:
location: http://control-plane.minikube.internal:8282/etcd.tgz

4
tools/deployment/airskiff/developer/000-clone-dependencies.sh
View File

@ -18,8 +18,8 @@
set -xe
: "${INSTALL_PATH:="../"}"
: "${OSH_COMMIT:="75c30f43db44218e7842611e880fd8d7a30fa79c"}"
: "${OSH_INFRA_COMMIT:="db3537e56b182a54e7f6931ce57e2a190714019b"}"
: "${OSH_COMMIT:="2d9457e34ca4200ed631466bd87569b0214c92e7"}"
: "${OSH_INFRA_COMMIT:="cfff60ec10a6c386f38db79bb9f59a552c2b032f"}"
: "${CLONE_ARMADA:=true}"
: "${CLONE_DECKHAND:=true}"
: "${CLONE_SHIPYARD:=true}"

5
type/skiff/config/endpoints.yaml
View File

@ -81,7 +81,7 @@ data:
oslo_db:
hosts:
default: mariadb
discovery: mariadb-discovery
primary: mariadb
host_fqdn_override:
default: null
path: /DB_NAME
@ -368,7 +368,7 @@ data:
oslo_db:
hosts:
default: mariadb
discovery: mariadb-discovery
primary: mariadb
host_fqdn_override:
default: null
path: /DB_NAME
@ -775,6 +775,7 @@ data:
namespace: osh-infra
hosts:
default: mariadb
primary: mariadb
host_fqdn_override:
default: null
path: /DB_NAME