openstack
/
openstack-helm-infra
Code Issues Proposed changes

Merge "Few updates for gnocchi chart"

This commit is contained in:
Zuul 2019-03-15 15:24:51 +00:00 committed by Gerrit Code Review
parent 394fb8a053 61c1e58e23
commit 8f0ff3f190
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gnocchi/templates/bin/_db-sync.sh.tpl
View File

@ -18,4 +18,4 @@ limitations under the License.
set -ex
exec gnocchi-upgrade --create-legacy-resource-types
exec gnocchi-upgrade

6
gnocchi/templates/configmap-etc.yaml
View File

@ -50,6 +50,12 @@ limitations under the License.
{{- $_ := set .Values.conf.gnocchi.keystone_authtoken "password" .Values.endpoints.identity.auth.gnocchi.password -}}
{{- end -}}
{{- if empty .Values.conf.gnocchi.DEFAULT.coordination_url -}}
{{- $endpointUrl := tuple "oslo_cache" "internal" "memcache" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" }}
{{- $driver := .Values.endpoints.oslo_cache.hosts.default -}}
{{- $_ := printf "%s://%s" $driver $endpointUrl | set .Values.conf.gnocchi.DEFAULT "coordination_url" -}}
{{- end -}}
{{- if empty .Values.conf.gnocchi.database.connection -}}
{{- $_ := tuple "oslo_db" "internal" "gnocchi" "mysql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | set .Values.conf.gnocchi.database "connection" -}}
{{- end -}}

3
gnocchi/values.yaml
View File

@ -50,6 +50,7 @@ images:
gnocchi_api: quay.io/attcomdev/ubuntu-source-gnocchi-api:3.0.3
gnocchi_statsd: quay.io/attcomdev/ubuntu-source-gnocchi-statsd:3.0.3
gnocchi_metricd: quay.io/attcomdev/ubuntu-source-gnocchi-metricd:3.0.3
gnocchi_resources_cleaner: quay.io/attcomdev/ubuntu-source-gnocchi-base:3.0.3
image_repo_sync: docker.io/docker:17.07.0
pull_policy: "IfNotPresent"
local_registry:
@ -599,7 +600,7 @@ endpoints:
# and memcache service.
memcache_secret_key: null
hosts:
default: memcache
default: memcached
host_fqdn_override:
default: null
port: