From 6b844382ad2975267c5b7c5d76f0234506a602b4 Mon Sep 17 00:00:00 2001 From: Chris Wedgwood Date: Tue, 6 Feb 2018 02:30:40 +0000 Subject: [PATCH] yaml cleanup: trim multiline strings Change-Id: Ice615c1d252651793dfa09b8e85a5b4228d68737 --- barbican/templates/configmap-bin.yaml | 4 +- barbican/templates/configmap-etc.yaml | 10 ++-- ceilometer/templates/configmap-bin.yaml | 16 +++--- ceilometer/templates/configmap-etc.yaml | 18 +++---- ceph/templates/configmap-bin-clients.yaml | 4 +- ceph/templates/configmap-bin-ks.yaml | 6 +-- ceph/templates/configmap-bin.yaml | 24 ++++----- ceph/templates/configmap-etc.yaml | 2 +- ceph/templates/configmap-templates.yaml | 12 ++--- cinder/templates/configmap-bin.yaml | 22 ++++---- cinder/templates/configmap-etc.yaml | 16 +++--- congress/templates/configmap-bin.yaml | 6 +-- congress/templates/configmap-etc.yaml | 6 +-- doc/source/devref/oslo-config.rst | 4 +- glance/templates/configmap-bin.yaml | 20 +++---- glance/templates/configmap-etc.yaml | 14 ++--- gnocchi/templates/configmap-bin.yaml | 30 +++++------ gnocchi/templates/configmap-etc.yaml | 8 +-- heat/templates/configmap-bin.yaml | 14 ++--- heat/templates/configmap-etc.yaml | 6 +-- horizon/templates/configmap-bin.yaml | 2 +- horizon/templates/configmap-etc.yaml | 14 ++--- ingress/templates/configmap-bin.yaml | 4 +- ironic/templates/configmap-bin.yaml | 8 +-- ironic/templates/configmap-etc.yaml | 8 +-- keystone/templates/configmap-bin.yaml | 6 +-- keystone/templates/configmap-etc.yaml | 16 +++--- libvirt/templates/configmap-bin.yaml | 2 +- libvirt/templates/configmap-etc.yaml | 4 +- magnum/templates/configmap-bin.yaml | 10 ++-- magnum/templates/configmap-etc.yaml | 6 +-- mistral/templates/configmap-bin.yaml | 14 ++--- mistral/templates/configmap-etc.yaml | 4 +- neutron/templates/configmap-bin.yaml | 36 ++++++------- neutron/templates/configmap-etc.yaml | 52 +++++++++---------- nova/templates/configmap-bin.yaml | 14 ++--- nova/templates/configmap-etc.yaml | 24 ++++----- openvswitch/templates/configmap-bin.yaml | 6 +-- rally/templates/configmap-bin.yaml | 2 +- rally/templates/configmap-etc.yaml | 2 +- rally/templates/configmap-tasks.yaml | 22 ++++---- rally/templates/configmap-test-templates.yaml | 30 +++++------ senlin/templates/configmap-bin.yaml | 10 ++-- senlin/templates/configmap-etc.yaml | 6 +-- 44 files changed, 272 insertions(+), 272 deletions(-) diff --git a/barbican/templates/configmap-bin.yaml b/barbican/templates/configmap-bin.yaml index 019b1d9eb6..8ef11d7126 100644 --- a/barbican/templates/configmap-bin.yaml +++ b/barbican/templates/configmap-bin.yaml @@ -23,7 +23,7 @@ metadata: name: barbican-bin data: {{- if .Values.bootstrap.enabled }} - bootstrap.sh: |+ + bootstrap.sh: | {{ tuple "bin/_bootstrap.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} {{- end }} barbican-test.sh: | @@ -32,7 +32,7 @@ data: {{- include "helm-toolkit.scripts.db_init" . | indent 4 }} db-sync.sh: | {{ tuple "bin/_db-sync.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} - db-drop.py: |+ + db-drop.py: | {{- include "helm-toolkit.scripts.db_drop" . | indent 4 }} barbican.sh: | {{ tuple "bin/_barbican.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} diff --git a/barbican/templates/configmap-etc.yaml b/barbican/templates/configmap-etc.yaml index 119cb2e449..9688041cf9 100644 --- a/barbican/templates/configmap-etc.yaml +++ b/barbican/templates/configmap-etc.yaml @@ -76,14 +76,14 @@ kind: ConfigMap metadata: name: barbican-etc data: - barbican.conf: |+ + barbican.conf: | {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.barbican | indent 4 }} - barbican-api-paste.ini: |+ + barbican-api-paste.ini: | {{ include "helm-toolkit.utils.to_ini" .Values.conf.paste | indent 4 }} - api_audit_map.conf: |+ + api_audit_map.conf: | {{ include "helm-toolkit.utils.to_ini" .Values.conf.audit_map | indent 4 }} - policy.json: |+ + policy.json: | {{ toJson .Values.conf.policy | indent 4 }} - barbican-api.ini: |+ + barbican-api.ini: | {{ include "helm-toolkit.utils.to_ini" .Values.conf.barbican_api | indent 4 }} {{- end }} diff --git a/ceilometer/templates/configmap-bin.yaml b/ceilometer/templates/configmap-bin.yaml index 66f2a86808..54c2545dbf 100644 --- a/ceilometer/templates/configmap-bin.yaml +++ b/ceilometer/templates/configmap-bin.yaml @@ -31,20 +31,20 @@ data: {{- include "helm-toolkit.scripts.db_init" . | indent 4 }} db-sync.sh: | {{ tuple "bin/_db-sync.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} - ks-service.sh: |+ + ks-service.sh: | {{- include "helm-toolkit.scripts.keystone_service" . | indent 4 }} - ks-endpoints.sh: |+ + ks-endpoints.sh: | {{- include "helm-toolkit.scripts.keystone_endpoints" . | indent 4 }} - ks-user.sh: |+ + ks-user.sh: | {{- include "helm-toolkit.scripts.keystone_user" . | indent 4 }} - ceilometer-api.sh: |+ + ceilometer-api.sh: | {{ tuple "bin/_ceilometer-api.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} - ceilometer-central.sh: |+ + ceilometer-central.sh: | {{ tuple "bin/_ceilometer-central.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} - ceilometer-collector.sh: |+ + ceilometer-collector.sh: | {{ tuple "bin/_ceilometer-collector.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} - ceilometer-compute.sh: |+ + ceilometer-compute.sh: | {{ tuple "bin/_ceilometer-compute.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} - ceilometer-notification.sh: |+ + ceilometer-notification.sh: | {{ tuple "bin/_ceilometer-notification.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} {{- end }} diff --git a/ceilometer/templates/configmap-etc.yaml b/ceilometer/templates/configmap-etc.yaml index 394f76f933..892e44d5db 100644 --- a/ceilometer/templates/configmap-etc.yaml +++ b/ceilometer/templates/configmap-etc.yaml @@ -108,22 +108,22 @@ kind: ConfigMap metadata: name: ceilometer-etc data: - rally_tests.yaml: |+ + rally_tests.yaml: | {{- tuple .Values.conf.rally_tests "etc/_rally_tests.yaml.tpl" . | include "helm-toolkit.utils.configmap_templater" }} - ceilometer.conf: |+ + ceilometer.conf: | {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.ceilometer | indent 4 }} - api_paste.ini: |+ + api_paste.ini: | {{ include "helm-toolkit.utils.to_ini" .Values.conf.paste | indent 4 }} - policy.json: |+ + policy.json: | {{ toJson .Values.conf.policy | indent 4 }} - event_pipeline.yaml: |+ + event_pipeline.yaml: | {{ toYaml .Values.conf.event_pipeline | indent 4 }} - pipeline.yaml: |+ + pipeline.yaml: | {{ toYaml .Values.conf.pipeline | indent 4 }} - event_definitions.yaml: |+ + event_definitions.yaml: | {{ toYaml .Values.conf.event_definitions | indent 4 }} - gnocchi_resources.yaml: |+ + gnocchi_resources.yaml: | {{ toYaml .Values.conf.gnocchi_resources | indent 4 }} - wsgi-ceilometer.conf: |+ + wsgi-ceilometer.conf: | {{- tuple .Values.conf.wsgi_ceilometer "etc/_wsgi-ceilometer.conf.tpl" . | include "helm-toolkit.utils.configmap_templater" }} {{- end }} diff --git a/ceph/templates/configmap-bin-clients.yaml b/ceph/templates/configmap-bin-clients.yaml index 31bc119ab6..d4647db3b0 100644 --- a/ceph/templates/configmap-bin-clients.yaml +++ b/ceph/templates/configmap-bin-clients.yaml @@ -22,8 +22,8 @@ kind: ConfigMap metadata: name: ceph-bin-clients data: - provisioner-rbd-namespace-client-key-manager.sh: |+ + provisioner-rbd-namespace-client-key-manager.sh: | {{ tuple "bin/provisioner/rbd/_namespace-client-key-manager.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} - provisioner-rbd-namespace-client-key-cleaner.sh: |+ + provisioner-rbd-namespace-client-key-cleaner.sh: | {{ tuple "bin/provisioner/rbd/_namespace-client-key-cleaner.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} {{- end }} diff --git a/ceph/templates/configmap-bin-ks.yaml b/ceph/templates/configmap-bin-ks.yaml index ace72b4dc5..2a502a3d63 100644 --- a/ceph/templates/configmap-bin-ks.yaml +++ b/ceph/templates/configmap-bin-ks.yaml @@ -22,10 +22,10 @@ kind: ConfigMap metadata: name: ceph-bin-ks data: - ks-service.sh: |+ + ks-service.sh: | {{- include "helm-toolkit.scripts.keystone_service" . | indent 4 }} - ks-endpoints.sh: |+ + ks-endpoints.sh: | {{- include "helm-toolkit.scripts.keystone_endpoints" . | indent 4 }} - ks-user.sh: |+ + ks-user.sh: | {{- include "helm-toolkit.scripts.keystone_user" . | indent 4 }} {{- end }} diff --git a/ceph/templates/configmap-bin.yaml b/ceph/templates/configmap-bin.yaml index 155449d9e1..0fc7eea748 100644 --- a/ceph/templates/configmap-bin.yaml +++ b/ceph/templates/configmap-bin.yaml @@ -23,31 +23,31 @@ metadata: name: ceph-bin data: {{- if .Values.bootstrap.enabled }} - bootstrap.sh: |+ + bootstrap.sh: | {{ tuple "bin/_bootstrap.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} {{- end }} - init-dirs.sh: |+ + init-dirs.sh: | {{ tuple "bin/_init-dirs.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} - pool-init.sh: |+ + pool-init.sh: | {{ tuple "bin/pool/_init.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} - pool-calc.py: |+ + pool-calc.py: | {{ tuple "bin/pool/_calc.py.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} - keys-bootstrap-keyring-generator.py: |+ + keys-bootstrap-keyring-generator.py: | {{ tuple "bin/keys/_bootstrap-keyring-generator.py.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} - keys-bootstrap-keyring-manager.sh: |+ + keys-bootstrap-keyring-manager.sh: | {{ tuple "bin/keys/_bootstrap-keyring-manager.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} - keys-storage-keyring-manager.sh: |+ + keys-storage-keyring-manager.sh: | {{ tuple "bin/keys/_storage-keyring-manager.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} - mds-start.sh: |+ + mds-start.sh: | {{ tuple "bin/mds/_start.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} - mgr-start.sh: |+ + mgr-start.sh: | {{ tuple "bin/mgr/_start.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} - mgr-check.sh: |+ + mgr-check.sh: | {{ tuple "bin/mgr/_check.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} mon-start.sh: | @@ -83,9 +83,9 @@ data: provisioner-rbd-start.sh: | {{ tuple "bin/provisioner/rbd/_start.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} - rgw-start.sh: |+ + rgw-start.sh: | {{ tuple "bin/rgw/_start.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} - rgw-init-keystone.sh: |+ + rgw-init-keystone.sh: | {{ tuple "bin/rgw/_init_keystone.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} {{- end }} diff --git a/ceph/templates/configmap-etc.yaml b/ceph/templates/configmap-etc.yaml index b68d225f45..bf6df35ac6 100644 --- a/ceph/templates/configmap-etc.yaml +++ b/ceph/templates/configmap-etc.yaml @@ -44,7 +44,7 @@ kind: ConfigMap metadata: name: {{ $configMapName }} data: - ceph.conf: |+ + ceph.conf: | {{ include "helm-toolkit.utils.to_ini" .Values.conf.ceph | indent 4 }} {{- end }} diff --git a/ceph/templates/configmap-templates.yaml b/ceph/templates/configmap-templates.yaml index 95ce112239..c4bc509fee 100644 --- a/ceph/templates/configmap-templates.yaml +++ b/ceph/templates/configmap-templates.yaml @@ -22,16 +22,16 @@ kind: ConfigMap metadata: name: ceph-templates data: - admin.keyring: |+ + admin.keyring: | {{ tuple "templates/_admin.keyring.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} - bootstrap.keyring.mds: |+ + bootstrap.keyring.mds: | {{ tuple "templates/_bootstrap.keyring.mds.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} - bootstrap.keyring.mgr: |+ + bootstrap.keyring.mgr: | {{ tuple "templates/_bootstrap.keyring.mgr.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} - bootstrap.keyring.osd: |+ + bootstrap.keyring.osd: | {{ tuple "templates/_bootstrap.keyring.osd.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} - bootstrap.keyring.rgw: |+ + bootstrap.keyring.rgw: | {{ tuple "templates/_bootstrap.keyring.rgw.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} - mon.keyring: |+ + mon.keyring: | {{ tuple "templates/_mon.keyring.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} {{- end }} diff --git a/cinder/templates/configmap-bin.yaml b/cinder/templates/configmap-bin.yaml index 75be206268..b0701c6609 100644 --- a/cinder/templates/configmap-bin.yaml +++ b/cinder/templates/configmap-bin.yaml @@ -29,13 +29,13 @@ data: {{- include "helm-toolkit.scripts.db_init" . | indent 4 }} db-sync.sh: | {{ tuple "bin/_db-sync.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} - db-drop.py: |+ + db-drop.py: | {{- include "helm-toolkit.scripts.db_drop" . | indent 4 }} - ks-service.sh: |+ + ks-service.sh: | {{- include "helm-toolkit.scripts.keystone_service" . | indent 4 }} - ks-endpoints.sh: |+ + ks-endpoints.sh: | {{- include "helm-toolkit.scripts.keystone_endpoints" . | indent 4 }} - ks-user.sh: |+ + ks-user.sh: | {{- include "helm-toolkit.scripts.keystone_user" . | indent 4 }} cinder-api.sh: | {{ tuple "bin/_cinder-api.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} @@ -45,20 +45,20 @@ data: {{ tuple "bin/_cinder-scheduler.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} cinder-volume.sh: | {{ tuple "bin/_cinder-volume.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} - ceph-keyring.sh: |+ + ceph-keyring.sh: | {{ tuple "bin/_ceph-keyring.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} - ceph-admin-keyring.sh: |+ + ceph-admin-keyring.sh: | {{ tuple "bin/_ceph-admin-keyring.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} - volume-usage-audit.sh: |+ + volume-usage-audit.sh: | {{ tuple "bin/_volume-usage-audit.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} - backup-storage-init.sh: |+ + backup-storage-init.sh: | {{ tuple "bin/_backup-storage-init.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} - storage-init.sh: |+ + storage-init.sh: | {{ tuple "bin/_storage-init.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} - clean-secrets.sh: |+ + clean-secrets.sh: | {{ tuple "bin/_clean-secrets.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} {{- if .Values.bootstrap.enabled }} - bootstrap.sh: |+ + bootstrap.sh: | {{ tuple "bin/_bootstrap.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} {{- end }} {{- end }} diff --git a/cinder/templates/configmap-etc.yaml b/cinder/templates/configmap-etc.yaml index b495d89f15..1dc3144225 100644 --- a/cinder/templates/configmap-etc.yaml +++ b/cinder/templates/configmap-etc.yaml @@ -98,20 +98,20 @@ kind: ConfigMap metadata: name: cinder-etc data: - rally_tests.yaml: |+ + rally_tests.yaml: | {{ toYaml .Values.conf.rally_tests.tests | indent 4 }} - cinder.conf: |+ + cinder.conf: | {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.cinder | indent 4 }} - backends.conf: |+ + backends.conf: | {{ include "helm-toolkit.utils.to_ini" .Values.conf.backends | indent 4 }} - api-paste.ini: |+ + api-paste.ini: | {{ include "helm-toolkit.utils.to_ini" .Values.conf.paste | indent 4 }} - policy.json: |+ + policy.json: | {{ toJson .Values.conf.policy | indent 4 }} - cinder_sudoers: |+ + cinder_sudoers: | {{- tuple .Values.conf.neutron_sudoers "etc/_cinder_sudoers.tpl" . | include "helm-toolkit.utils.configmap_templater" }} - rootwrap.conf: |+ + rootwrap.conf: | {{- tuple .Values.conf.rootwrap "etc/_rootwrap.conf.tpl" . | include "helm-toolkit.utils.configmap_templater" }} - volume.filters: |+ + volume.filters: | {{- tuple .Values.conf.rootwrap_filters.volume "etc/rootwrap.d/_volume.filters.tpl" . | include "helm-toolkit.utils.configmap_templater" }} {{- end }} diff --git a/congress/templates/configmap-bin.yaml b/congress/templates/configmap-bin.yaml index ff9aba3ff3..a16bdefedc 100644 --- a/congress/templates/configmap-bin.yaml +++ b/congress/templates/configmap-bin.yaml @@ -36,10 +36,10 @@ data: {{ tuple "bin/_ds_create.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} congress-test.sh: | {{ tuple "bin/_helm-tests.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} - ks-service.sh: |+ + ks-service.sh: | {{- include "helm-toolkit.scripts.keystone_service" . | indent 4 }} - ks-endpoints.sh: |+ + ks-endpoints.sh: | {{- include "helm-toolkit.scripts.keystone_endpoints" . | indent 4 }} - ks-user.sh: |+ + ks-user.sh: | {{- include "helm-toolkit.scripts.keystone_user" . | indent 4 }} {{- end }} diff --git a/congress/templates/configmap-etc.yaml b/congress/templates/configmap-etc.yaml index 9d3a4e79dc..bf9c5a8ab7 100644 --- a/congress/templates/configmap-etc.yaml +++ b/congress/templates/configmap-etc.yaml @@ -63,10 +63,10 @@ kind: ConfigMap metadata: name: congress-etc data: - congress.conf: |+ + congress.conf: | {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.congress | indent 4 }} - api-paste.ini: |+ + api-paste.ini: | {{ include "helm-toolkit.utils.to_ini" .Values.conf.paste | indent 4 }} - policy.json: |+ + policy.json: | {{ toJson .Values.conf.policy | indent 4 }} {{- end }} diff --git a/doc/source/devref/oslo-config.rst b/doc/source/devref/oslo-config.rst index f885366ead..6596a9b86d 100644 --- a/doc/source/devref/oslo-config.rst +++ b/doc/source/devref/oslo-config.rst @@ -47,7 +47,7 @@ produce the following config file: metadata: name: keystone-etc data: - keystone.conf: |+ + keystone.conf: | [DEFAULT] max_token_size = 255 transport_url = rabbit://keystone:password@rabbitmq.default.svc.cluster.local:5672/openstack @@ -94,6 +94,6 @@ performed via statements in the configmap template, which also calls the metadata: name: keystone-etc data: - keystone.conf: |+ + keystone.conf: | {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.keystone | indent 4 }} {{- end }} diff --git a/glance/templates/configmap-bin.yaml b/glance/templates/configmap-bin.yaml index 6932dab472..3d21f788a3 100644 --- a/glance/templates/configmap-bin.yaml +++ b/glance/templates/configmap-bin.yaml @@ -25,32 +25,32 @@ metadata: data: rally-test.sh: | {{ tuple $rallyTests | include "helm-toolkit.scripts.rally_test" | indent 4 }} - storage-init.sh: |+ + storage-init.sh: | {{ tuple "bin/_storage-init.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} db-init.py: | {{- include "helm-toolkit.scripts.db_init" . | indent 4 }} db-sync.sh: | {{ tuple "bin/_db-sync.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} - db-drop.py: |+ + db-drop.py: | {{- include "helm-toolkit.scripts.db_drop" . | indent 4 }} - ks-service.sh: |+ + ks-service.sh: | {{- include "helm-toolkit.scripts.keystone_service" . | indent 4 }} - ks-endpoints.sh: |+ + ks-endpoints.sh: | {{- include "helm-toolkit.scripts.keystone_endpoints" . | indent 4 }} - ks-user.sh: |+ + ks-user.sh: | {{- include "helm-toolkit.scripts.keystone_user" . | indent 4 }} glance-api.sh: | {{ tuple "bin/_glance-api.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} glance-registry.sh: | {{ tuple "bin/_glance-registry.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} - bootstrap.sh: |+ + bootstrap.sh: | {{ tuple "bin/_bootstrap.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} - ceph-keyring.sh: |+ + ceph-keyring.sh: | {{ tuple "bin/_ceph-keyring.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} - ceph-admin-keyring.sh: |+ + ceph-admin-keyring.sh: | {{ tuple "bin/_ceph-admin-keyring.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} - clean-image.sh: |+ + clean-image.sh: | {{ tuple "bin/_clean-image.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} - clean-secrets.sh: |+ + clean-secrets.sh: | {{ tuple "bin/_clean-secrets.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} {{- end }} diff --git a/glance/templates/configmap-etc.yaml b/glance/templates/configmap-etc.yaml index 52b9626069..79f50d9b08 100644 --- a/glance/templates/configmap-etc.yaml +++ b/glance/templates/configmap-etc.yaml @@ -144,18 +144,18 @@ kind: ConfigMap metadata: name: glance-etc data: - rally_tests.yaml: |+ + rally_tests.yaml: | {{ toYaml .Values.conf.rally_tests.tests | indent 4 }} - glance-api.conf: |+ + glance-api.conf: | {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.glance | indent 4 }} - glance-api-paste.ini: |+ + glance-api-paste.ini: | {{ include "helm-toolkit.utils.to_ini" .Values.conf.paste | indent 4 }} - glance-registry.conf: |+ + glance-registry.conf: | {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.glance_registry | indent 4 }} - glance-registry-paste.ini: |+ + glance-registry-paste.ini: | {{ include "helm-toolkit.utils.to_ini" .Values.conf.paste_registry | indent 4 }} - policy.json: |+ + policy.json: | {{ toJson .Values.conf.policy | indent 4 }} - swift-store.conf: |+ + swift-store.conf: | {{- tuple .Values.conf.swift_store "etc/_swift-store.conf.tpl" . | include "helm-toolkit.utils.configmap_templater" }} {{- end }} diff --git a/gnocchi/templates/configmap-bin.yaml b/gnocchi/templates/configmap-bin.yaml index 7600f1ff01..6c957184be 100644 --- a/gnocchi/templates/configmap-bin.yaml +++ b/gnocchi/templates/configmap-bin.yaml @@ -22,34 +22,34 @@ kind: ConfigMap metadata: name: gnocchi-bin data: - storage-init.sh: |+ + storage-init.sh: | {{ tuple "bin/_storage-init.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} - clean-secrets.sh: |+ + clean-secrets.sh: | {{ tuple "bin/_clean-secrets.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} - db-init.sh: |+ + db-init.sh: | {{ tuple "bin/_db-init.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} - db-init.py: |+ + db-init.py: | {{- include "helm-toolkit.scripts.db_init" . | indent 4 }} - db-sync.sh: |+ + db-sync.sh: | {{ tuple "bin/_db-sync.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} - gnocchi-api.sh: |+ + gnocchi-api.sh: | {{ tuple "bin/_gnocchi-api.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} - gnocchi-metricd.sh: |+ + gnocchi-metricd.sh: | {{ tuple "bin/_gnocchi-metricd.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} - gnocchi-statsd.sh: |+ + gnocchi-statsd.sh: | {{ tuple "bin/_gnocchi-statsd.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} - ks-service.sh: |+ + ks-service.sh: | {{- include "helm-toolkit.scripts.keystone_service" . | indent 4 }} - ks-endpoints.sh: |+ + ks-endpoints.sh: | {{- include "helm-toolkit.scripts.keystone_endpoints" . | indent 4 }} - ks-user.sh: |+ + ks-user.sh: | {{- include "helm-toolkit.scripts.keystone_user" . | indent 4 }} - ks-domain-user.sh: |+ + ks-domain-user.sh: | {{- include "helm-toolkit.scripts.keystone_domain_user" . | indent 4 }} - ceph-keyring.sh: |+ + ceph-keyring.sh: | {{ tuple "bin/_ceph-keyring.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} - ceph-admin-keyring.sh: |+ + ceph-admin-keyring.sh: | {{ tuple "bin/_ceph-admin-keyring.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} - gnocchi-test.sh: |+ + gnocchi-test.sh: | {{ tuple "bin/_gnocchi-test.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} {{- end }} diff --git a/gnocchi/templates/configmap-etc.yaml b/gnocchi/templates/configmap-etc.yaml index 4b94c987b8..4f804796b2 100644 --- a/gnocchi/templates/configmap-etc.yaml +++ b/gnocchi/templates/configmap-etc.yaml @@ -82,12 +82,12 @@ kind: ConfigMap metadata: name: gnocchi-etc data: - gnocchi.conf: |+ + gnocchi.conf: | {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.gnocchi | indent 4 }} - api-paste.ini: |+ + api-paste.ini: | {{ include "helm-toolkit.utils.to_ini" .Values.conf.paste | indent 4 }} - policy.json: |+ + policy.json: | {{ toJson .Values.conf.policy | indent 4 }} - wsgi-gnocchi.conf: |+ + wsgi-gnocchi.conf: | {{- tuple .Values.conf.wsgi_gnocchi "etc/_wsgi-gnocchi.conf.tpl" . | include "helm-toolkit.utils.configmap_templater" }} {{- end }} diff --git a/heat/templates/configmap-bin.yaml b/heat/templates/configmap-bin.yaml index 9661f30196..6a79419c99 100644 --- a/heat/templates/configmap-bin.yaml +++ b/heat/templates/configmap-bin.yaml @@ -23,24 +23,24 @@ metadata: name: heat-bin data: {{- if .Values.bootstrap.enabled }} - bootstrap.sh: |+ + bootstrap.sh: | {{ tuple "bin/_bootstrap.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} {{- end }} db-init.py: | {{- include "helm-toolkit.scripts.db_init" . | indent 4 }} db-sync.sh: | {{ tuple "bin/_db-sync.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} - db-drop.py: |+ + db-drop.py: | {{- include "helm-toolkit.scripts.db_drop" . | indent 4 }} - ks-service.sh: |+ + ks-service.sh: | {{- include "helm-toolkit.scripts.keystone_service" . | indent 4 }} - ks-endpoints.sh: |+ + ks-endpoints.sh: | {{- include "helm-toolkit.scripts.keystone_endpoints" . | indent 4 }} - ks-user.sh: |+ + ks-user.sh: | {{- include "helm-toolkit.scripts.keystone_user" . | indent 4 }} - ks-domain-user.sh: |+ + ks-domain-user.sh: | {{- include "helm-toolkit.scripts.keystone_domain_user" . | indent 4 }} - trusts.sh: |+ + trusts.sh: | {{ tuple "bin/_trusts.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} heat-api.sh: | {{ tuple "bin/_heat-api.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} diff --git a/heat/templates/configmap-etc.yaml b/heat/templates/configmap-etc.yaml index 8543c20a4a..c43d15c7b1 100644 --- a/heat/templates/configmap-etc.yaml +++ b/heat/templates/configmap-etc.yaml @@ -115,10 +115,10 @@ kind: ConfigMap metadata: name: heat-etc data: - heat.conf: |+ + heat.conf: | {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.heat | indent 4 }} - api-paste.ini: |+ + api-paste.ini: | {{ include "helm-toolkit.utils.to_ini" .Values.conf.paste | indent 4 }} - policy.json: |+ + policy.json: | {{ toJson .Values.conf.policy | indent 4 }} {{- end }} diff --git a/horizon/templates/configmap-bin.yaml b/horizon/templates/configmap-bin.yaml index 113bbff0c6..dce86560ca 100644 --- a/horizon/templates/configmap-bin.yaml +++ b/horizon/templates/configmap-bin.yaml @@ -26,7 +26,7 @@ data: {{- include "helm-toolkit.scripts.db_init" . | indent 4 }} db-sync.sh: | {{ tuple "bin/_db-sync.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} - db-drop.py: |+ + db-drop.py: | {{- include "helm-toolkit.scripts.db_drop" . | indent 4 }} horizon.sh: | {{ tuple "bin/_horizon.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} diff --git a/horizon/templates/configmap-etc.yaml b/horizon/templates/configmap-etc.yaml index 9b8c6dcc2a..e45bb31d03 100644 --- a/horizon/templates/configmap-etc.yaml +++ b/horizon/templates/configmap-etc.yaml @@ -26,18 +26,18 @@ data: {{ tuple "etc/_horizon.conf.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} local_settings: | {{ tuple "etc/_local_settings.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} - ceilometer_policy.json: |+ + ceilometer_policy.json: | {{ toJson .Values.conf.ceilometer_policy | indent 4 }} - cinder_policy.json: |+ + cinder_policy.json: | {{ toJson .Values.conf.cinder_policy | indent 4 }} - glance_policy.json: |+ + glance_policy.json: | {{ toJson .Values.conf.glance_policy | indent 4 }} - heat_policy.json: |+ + heat_policy.json: | {{ toJson .Values.conf.heat_policy | indent 4 }} - keystone_policy.json: |+ + keystone_policy.json: | {{ toJson .Values.conf.keystone_policy | indent 4 }} - neutron_policy.json: |+ + neutron_policy.json: | {{ toJson .Values.conf.neutron_policy | indent 4 }} - nova_policy.json: |+ + nova_policy.json: | {{ toJson .Values.conf.nova_policy | indent 4 }} {{- end }} diff --git a/ingress/templates/configmap-bin.yaml b/ingress/templates/configmap-bin.yaml index ff08e5ded8..ad9cb1767f 100644 --- a/ingress/templates/configmap-bin.yaml +++ b/ingress/templates/configmap-bin.yaml @@ -26,8 +26,8 @@ data: ingress-vip.sh: | {{ tuple "bin/_ingress-vip.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} {{- end }} - ingress-controller.sh: |+ + ingress-controller.sh: | {{ tuple "bin/_ingress-controller.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} - ingress-error-pages.sh: |+ + ingress-error-pages.sh: | {{ tuple "bin/_ingress-error-pages.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} {{- end }} diff --git a/ironic/templates/configmap-bin.yaml b/ironic/templates/configmap-bin.yaml index 92056cf904..ef919405a5 100644 --- a/ironic/templates/configmap-bin.yaml +++ b/ironic/templates/configmap-bin.yaml @@ -23,7 +23,7 @@ metadata: name: ironic-bin data: {{- if .Values.bootstrap.enabled }} - bootstrap.sh: |+ + bootstrap.sh: | {{ tuple "bin/_bootstrap.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} {{- end }} manage-cleaning-network.sh: | @@ -34,11 +34,11 @@ data: {{- include "helm-toolkit.scripts.db_init" . | indent 4 }} db-sync.sh: | {{ tuple "bin/_db-sync.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} - ks-service.sh: |+ + ks-service.sh: | {{- include "helm-toolkit.scripts.keystone_service" . | indent 4 }} - ks-endpoints.sh: |+ + ks-endpoints.sh: | {{- include "helm-toolkit.scripts.keystone_endpoints" . | indent 4 }} - ks-user.sh: |+ + ks-user.sh: | {{- include "helm-toolkit.scripts.keystone_user" . | indent 4 }} ironic-api.sh: | {{ tuple "bin/_ironic-api.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} diff --git a/ironic/templates/configmap-etc.yaml b/ironic/templates/configmap-etc.yaml index edba009799..2662983210 100644 --- a/ironic/templates/configmap-etc.yaml +++ b/ironic/templates/configmap-etc.yaml @@ -187,11 +187,11 @@ kind: ConfigMap metadata: name: ironic-etc data: - ironic.conf: |+ + ironic.conf: | {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.ironic | indent 4 }} - policy.json: |+ + policy.json: | {{ toJson .Values.conf.policy | indent 4 }} - tftp-map-file: |+ + tftp-map-file: | {{ if .Values.conf.tftp_map_file.override -}} {{ .Values.conf.tftp_map_file.override | indent 4 }} {{- else -}} @@ -200,7 +200,7 @@ data: {{- if .Values.conf.tftp_map_file.append -}} {{ .Values.conf.tftp_map_file.append | indent 4 }} {{- end }} - nginx.conf: |+ + nginx.conf: | {{ if .Values.conf.nginx.override -}} {{ .Values.conf.nginx.override | indent 4 }} {{- else -}} diff --git a/keystone/templates/configmap-bin.yaml b/keystone/templates/configmap-bin.yaml index 0586d49d2f..95ba454871 100644 --- a/keystone/templates/configmap-bin.yaml +++ b/keystone/templates/configmap-bin.yaml @@ -24,18 +24,18 @@ metadata: name: keystone-bin data: {{- if .Values.bootstrap.enabled }} - bootstrap.sh: |+ + bootstrap.sh: | {{ tuple "bin/_bootstrap.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} {{- end }} rally-test.sh: | {{ tuple $rallyTests | include "helm-toolkit.scripts.rally_test" | indent 4 }} - ks-user.sh: |+ + ks-user.sh: | {{- include "helm-toolkit.scripts.keystone_user" . | indent 4 }} db-init.py: | {{- include "helm-toolkit.scripts.db_init" . | indent 4 }} db-sync.sh: | {{ tuple "bin/_db-sync.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} - db-drop.py: |+ + db-drop.py: | {{- include "helm-toolkit.scripts.db_drop" . | indent 4 }} keystone-api.sh: | {{ tuple "bin/_keystone-api.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} diff --git a/keystone/templates/configmap-etc.yaml b/keystone/templates/configmap-etc.yaml index 967ae9c89e..bb52de8ccd 100644 --- a/keystone/templates/configmap-etc.yaml +++ b/keystone/templates/configmap-etc.yaml @@ -35,22 +35,22 @@ kind: ConfigMap metadata: name: keystone-etc data: - rally_tests.yaml: |+ + rally_tests.yaml: | {{ toYaml .Values.conf.rally_tests.tests | indent 4 }} - keystone.conf: |+ + keystone.conf: | {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.keystone | indent 4 }} - keystone-paste.ini: |+ + keystone-paste.ini: | {{ include "helm-toolkit.utils.to_ini" .Values.conf.paste | indent 4 }} - policy.json: |+ + policy.json: | {{ toJson .Values.conf.policy | indent 4 }} - mpm_event.conf: |+ + mpm_event.conf: | {{- tuple .Values.conf.mpm_event "etc/_mpm_event.conf.tpl" . | include "helm-toolkit.utils.configmap_templater" }} - wsgi-keystone.conf: |+ + wsgi-keystone.conf: | {{- tuple .Values.conf.wsgi_keystone "etc/_wsgi-keystone.conf.tpl" . | include "helm-toolkit.utils.configmap_templater" }} - sso_callback_template.html: |+ + sso_callback_template.html: | {{- tuple .Values.conf.sso_callback_template "etc/_sso_callback_template.html.tpl" . | include "helm-toolkit.utils.configmap_templater" }} {{- range $k, $v := .Values.conf.ks_domains }} - keystone.{{ $k }}.conf: |+ + keystone.{{ $k }}.conf: | {{ include "helm-toolkit.utils.to_oslo_conf" $v | indent 4 }} {{- end }} {{- end }} diff --git a/libvirt/templates/configmap-bin.yaml b/libvirt/templates/configmap-bin.yaml index 30e00a2f3c..917d11adad 100644 --- a/libvirt/templates/configmap-bin.yaml +++ b/libvirt/templates/configmap-bin.yaml @@ -25,7 +25,7 @@ data: libvirt.sh: | {{ tuple "bin/_libvirt.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} {{- if .Values.ceph.enabled }} - ceph-keyring.sh: |+ + ceph-keyring.sh: | {{ tuple "bin/_ceph-keyring.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} {{- end }} {{- end }} diff --git a/libvirt/templates/configmap-etc.yaml b/libvirt/templates/configmap-etc.yaml index f24f486c96..0dcbc099e4 100644 --- a/libvirt/templates/configmap-etc.yaml +++ b/libvirt/templates/configmap-etc.yaml @@ -22,8 +22,8 @@ kind: ConfigMap metadata: name: libvirt-etc data: - libvirtd.conf: |+ + libvirtd.conf: | {{- include "helm-toolkit.utils.to_kv_list" .Values.conf.libvirt | indent 4 }} - qemu.conf: |+ + qemu.conf: | {{- include "helm-toolkit.utils.to_kv_list" .Values.conf.qemu | indent 4 }} {{- end }} diff --git a/magnum/templates/configmap-bin.yaml b/magnum/templates/configmap-bin.yaml index a3f7985866..e83fa067f2 100644 --- a/magnum/templates/configmap-bin.yaml +++ b/magnum/templates/configmap-bin.yaml @@ -23,20 +23,20 @@ metadata: name: magnum-bin data: {{- if .Values.bootstrap.enabled }} - bootstrap.sh: |+ + bootstrap.sh: | {{ tuple "bin/_bootstrap.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} {{- end }} db-init.py: | {{- include "helm-toolkit.scripts.db_init" . | indent 4 }} db-sync.sh: | {{ tuple "bin/_db-sync.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} - db-drop.py: |+ + db-drop.py: | {{- include "helm-toolkit.scripts.db_drop" . | indent 4 }} - ks-service.sh: |+ + ks-service.sh: | {{- include "helm-toolkit.scripts.keystone_service" . | indent 4 }} - ks-endpoints.sh: |+ + ks-endpoints.sh: | {{- include "helm-toolkit.scripts.keystone_endpoints" . | indent 4 }} - ks-user.sh: |+ + ks-user.sh: | {{- include "helm-toolkit.scripts.keystone_user" . | indent 4 }} magnum-api.sh: | {{ tuple "bin/_magnum-api.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} diff --git a/magnum/templates/configmap-etc.yaml b/magnum/templates/configmap-etc.yaml index e77bcb298b..9f81f63e00 100644 --- a/magnum/templates/configmap-etc.yaml +++ b/magnum/templates/configmap-etc.yaml @@ -67,10 +67,10 @@ kind: ConfigMap metadata: name: magnum-etc data: - magnum.conf: |+ + magnum.conf: | {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.magnum | indent 4 }} - api-paste.ini: |+ + api-paste.ini: | {{ include "helm-toolkit.utils.to_ini" .Values.conf.paste | indent 4 }} - policy.json: |+ + policy.json: | {{ toJson .Values.conf.policy | indent 4 }} {{- end }} diff --git a/mistral/templates/configmap-bin.yaml b/mistral/templates/configmap-bin.yaml index 64a767e516..04a5055b85 100644 --- a/mistral/templates/configmap-bin.yaml +++ b/mistral/templates/configmap-bin.yaml @@ -23,20 +23,20 @@ metadata: name: mistral-bin data: {{- if .Values.bootstrap.enabled }} - bootstrap.sh: |+ + bootstrap.sh: | {{ tuple "bin/_bootstrap.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} {{- end }} - db-init.py: |+ + db-init.py: | {{- include "helm-toolkit.scripts.db_init" . | indent 4 }} - db-sync.sh: |+ + db-sync.sh: | {{ tuple "bin/_db-sync.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} - db-drop.py: |+ + db-drop.py: | {{- include "helm-toolkit.scripts.db_drop" . | indent 4 }} - ks-service.sh: |+ + ks-service.sh: | {{- include "helm-toolkit.scripts.keystone_service" . | indent 4 }} - ks-endpoints.sh: |+ + ks-endpoints.sh: | {{- include "helm-toolkit.scripts.keystone_endpoints" . | indent 4 }} - ks-user.sh: |+ + ks-user.sh: | {{- include "helm-toolkit.scripts.keystone_user" . | indent 4 }} mistral-api.sh: | {{ tuple "bin/_mistral-api.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} diff --git a/mistral/templates/configmap-etc.yaml b/mistral/templates/configmap-etc.yaml index 2b82385c45..447a01ef97 100644 --- a/mistral/templates/configmap-etc.yaml +++ b/mistral/templates/configmap-etc.yaml @@ -67,8 +67,8 @@ kind: ConfigMap metadata: name: mistral-etc data: - mistral.conf: |+ + mistral.conf: | {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.mistral | indent 4 }} - policy.json: |+ + policy.json: | {{ toJson .Values.conf.policy | indent 4 }} {{- end }} diff --git a/neutron/templates/configmap-bin.yaml b/neutron/templates/configmap-bin.yaml index aaef7f3b2d..cafa223ef4 100644 --- a/neutron/templates/configmap-bin.yaml +++ b/neutron/templates/configmap-bin.yaml @@ -24,43 +24,43 @@ metadata: name: neutron-bin data: {{- if .Values.bootstrap.enabled }} - bootstrap.sh: |+ + bootstrap.sh: | {{ tuple "bin/_bootstrap.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} {{- end }} rally-test.sh: | {{ tuple $rallyTests | include "helm-toolkit.scripts.rally_test" | indent 4 }} - db-init.py: |+ + db-init.py: | {{- include "helm-toolkit.scripts.db_init" . | indent 4 }} - db-sync.sh: |+ + db-sync.sh: | {{ tuple "bin/_db-sync.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} - db-drop.py: |+ + db-drop.py: | {{- include "helm-toolkit.scripts.db_drop" . | indent 4 }} - ks-service.sh: |+ + ks-service.sh: | {{- include "helm-toolkit.scripts.keystone_service" . | indent 4 }} - ks-endpoints.sh: |+ + ks-endpoints.sh: | {{- include "helm-toolkit.scripts.keystone_endpoints" . | indent 4 }} - ks-user.sh: |+ + ks-user.sh: | {{- include "helm-toolkit.scripts.keystone_user" . | indent 4 }} - neutron-dhcp-agent.sh: |+ + neutron-dhcp-agent.sh: | {{ tuple "bin/_neutron-dhcp-agent.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} - neutron-l3-agent.sh: |+ + neutron-l3-agent.sh: | {{ tuple "bin/_neutron-l3-agent.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} - neutron-linuxbridge-agent.sh: |+ + neutron-linuxbridge-agent.sh: | {{ tuple "bin/_neutron-linuxbridge-agent.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} - neutron-linuxbridge-agent-init.sh: |+ + neutron-linuxbridge-agent-init.sh: | {{ tuple "bin/_neutron-linuxbridge-agent-init.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} - neutron-linuxbridge-agent-init-modules.sh: |+ + neutron-linuxbridge-agent-init-modules.sh: | {{ tuple "bin/_neutron-linuxbridge-agent-init-modules.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} - neutron-metadata-agent.sh: |+ + neutron-metadata-agent.sh: | {{ tuple "bin/_neutron-metadata-agent.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} - neutron-metadata-agent-init.sh: |+ + neutron-metadata-agent-init.sh: | {{ tuple "bin/_neutron-metadata-agent-init.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} - neutron-openvswitch-agent.sh: |+ + neutron-openvswitch-agent.sh: | {{ tuple "bin/_neutron-openvswitch-agent.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} - neutron-openvswitch-agent-init.sh: |+ + neutron-openvswitch-agent-init.sh: | {{ tuple "bin/_neutron-openvswitch-agent-init.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} - neutron-openvswitch-agent-init-modules.sh: |+ + neutron-openvswitch-agent-init-modules.sh: | {{ tuple "bin/_neutron-openvswitch-agent-init-modules.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} - neutron-server.sh: |+ + neutron-server.sh: | {{ tuple "bin/_neutron-server.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} {{- end }} diff --git a/neutron/templates/configmap-etc.yaml b/neutron/templates/configmap-etc.yaml index 8e5c02833e..07c8a64f87 100644 --- a/neutron/templates/configmap-etc.yaml +++ b/neutron/templates/configmap-etc.yaml @@ -98,57 +98,57 @@ kind: ConfigMap metadata: name: neutron-etc data: - rally_tests.yaml: |+ + rally_tests.yaml: | {{ toYaml .Values.conf.rally_tests.tests | indent 4 }} - api-paste.ini: |+ + api-paste.ini: | {{ include "helm-toolkit.utils.to_ini" .Values.conf.paste | indent 4 }} - policy.json: |+ + policy.json: | {{ toJson .Values.conf.policy | indent 4 }} - neutron.conf: |+ + neutron.conf: | {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.neutron | indent 4 }} - dhcp_agent.ini: |+ + dhcp_agent.ini: | {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.dhcp_agent | indent 4 }} - l3_agent.ini: |+ + l3_agent.ini: | {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.l3_agent | indent 4 }} - metadata_agent.ini: |+ + metadata_agent.ini: | {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.metadata_agent | indent 4 }} - metering_agent.ini: |+ + metering_agent.ini: | {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.metering_agent | indent 4 }} - ml2_conf.ini: |+ + ml2_conf.ini: | {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.plugins.ml2_conf | indent 4 }} - ml2_conf_sriov.ini: |+ + ml2_conf_sriov.ini: | {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.plugins.ml2_conf_sriov | indent 4 }} - macvtap_agent.ini: |+ + macvtap_agent.ini: | {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.plugins.macvtap_agent | indent 4 }} - linuxbridge_agent.ini: |+ + linuxbridge_agent.ini: | {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.plugins.linuxbridge_agent | indent 4 }} - openvswitch_agent.ini: |+ + openvswitch_agent.ini: | {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.plugins.openvswitch_agent | indent 4 }} - sriov_agent.ini: |+ + sriov_agent.ini: | {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.plugins.sriov_agent | indent 4 }} dnsmasq.conf: "" - neutron_sudoers: |+ + neutron_sudoers: | {{- tuple .Values.conf.neutron_sudoers "etc/_neutron_sudoers.tpl" . | include "helm-toolkit.utils.configmap_templater" }} - rootwrap.conf: |+ + rootwrap.conf: | {{- tuple .Values.conf.rootwrap "etc/_rootwrap.conf.tpl" . | include "helm-toolkit.utils.configmap_templater" }} - debug.filters: |+ + debug.filters: | {{- tuple .Values.conf.rootwrap_filters.debug "etc/rootwrap.d/_debug.filters.tpl" . | include "helm-toolkit.utils.configmap_templater" }} - dibbler.filters: |+ + dibbler.filters: | {{- tuple .Values.conf.rootwrap_filters.dibbler "etc/rootwrap.d/_dibbler.filters.tpl" . | include "helm-toolkit.utils.configmap_templater" }} - ipset-firewall.filters: |+ + ipset-firewall.filters: | {{- tuple .Values.conf.rootwrap_filters.ipset_firewall "etc/rootwrap.d/_ipset-firewall.filters.tpl" . | include "helm-toolkit.utils.configmap_templater" }} - l3.filters: |+ + l3.filters: | {{- tuple .Values.conf.rootwrap_filters.l3 "etc/rootwrap.d/_l3.filters.tpl" . | include "helm-toolkit.utils.configmap_templater" }} - netns-cleanup.filters: |+ + netns-cleanup.filters: | {{- tuple .Values.conf.rootwrap_filters.netns_cleanup "etc/rootwrap.d/_netns-cleanup.filters.tpl" . | include "helm-toolkit.utils.configmap_templater" }} - dhcp.filters: |+ + dhcp.filters: | {{- tuple .Values.conf.rootwrap_filters.dhcp "etc/rootwrap.d/_dhcp.filters.tpl" . | include "helm-toolkit.utils.configmap_templater" }} - ebtables.filters: |+ + ebtables.filters: | {{- tuple .Values.conf.rootwrap_filters.ebtables "etc/rootwrap.d/_ebtables.filters.tpl" . | include "helm-toolkit.utils.configmap_templater" }} - iptables-firewall.filters: |+ + iptables-firewall.filters: | {{- tuple .Values.conf.rootwrap_filters.iptables_firewall "etc/rootwrap.d/_iptables-firewall.filters.tpl" . | include "helm-toolkit.utils.configmap_templater" }} - linuxbridge-plugin.filters: |+ + linuxbridge-plugin.filters: | {{- tuple .Values.conf.rootwrap_filters.linuxbridge_plugin "etc/rootwrap.d/_linuxbridge-plugin.filters.tpl" . | include "helm-toolkit.utils.configmap_templater" }} - openvswitch-plugin.filters: |+ + openvswitch-plugin.filters: | {{- tuple .Values.conf.rootwrap_filters.openvswitch_plugin "etc/rootwrap.d/_openvswitch-plugin.filters.tpl" . | include "helm-toolkit.utils.configmap_templater" }} {{- end }} diff --git a/nova/templates/configmap-bin.yaml b/nova/templates/configmap-bin.yaml index 4a9f4d564e..6a1bf2aa43 100644 --- a/nova/templates/configmap-bin.yaml +++ b/nova/templates/configmap-bin.yaml @@ -25,20 +25,20 @@ metadata: data: rally-test.sh: | {{ tuple $rallyTests | include "helm-toolkit.scripts.rally_test" | indent 4 }} - db-init.py: |+ + db-init.py: | {{- include "helm-toolkit.scripts.db_init" . | indent 4 }} - db-sync.sh: |+ + db-sync.sh: | {{ tuple "bin/_db-sync.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} - db-drop.py: |+ + db-drop.py: | {{- include "helm-toolkit.scripts.db_drop" . | indent 4 }} - ks-service.sh: |+ + ks-service.sh: | {{- include "helm-toolkit.scripts.keystone_service" . | indent 4 }} - ks-endpoints.sh: |+ + ks-endpoints.sh: | {{- include "helm-toolkit.scripts.keystone_endpoints" . | indent 4 }} - ks-user.sh: |+ + ks-user.sh: | {{- include "helm-toolkit.scripts.keystone_user" . | indent 4 }} {{- if .Values.ceph.enabled }} - ceph-keyring.sh: |+ + ceph-keyring.sh: | {{ tuple "bin/_ceph-keyring.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} {{- end }} bootstrap.sh: | diff --git a/nova/templates/configmap-etc.yaml b/nova/templates/configmap-etc.yaml index 6beebb362f..a0b12a00b8 100644 --- a/nova/templates/configmap-etc.yaml +++ b/nova/templates/configmap-etc.yaml @@ -206,29 +206,29 @@ kind: ConfigMap metadata: name: {{ $configMapName }} data: - rally_tests.yaml: |+ + rally_tests.yaml: | {{ toYaml .Values.conf.rally_tests.tests | indent 4 }} - api-paste.ini: |+ + api-paste.ini: | {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.paste | indent 4 }} - policy.yaml: |+ + policy.yaml: | {{ toYaml .Values.conf.policy | indent 4 }} - nova_sudoers: |+ + nova_sudoers: | {{- tuple .Values.conf.neutron_sudoers "etc/_nova_sudoers.tpl" . | include "helm-toolkit.utils.configmap_templater" }} - rootwrap.conf: |+ + rootwrap.conf: | {{- tuple .Values.conf.rootwrap "etc/_rootwrap.conf.tpl" . | include "helm-toolkit.utils.configmap_templater" }} - api-metadata.filters: |+ + api-metadata.filters: | {{- tuple .Values.conf.rootwrap_filters.api_metadata "etc/rootwrap.d/_api-metadata.filters.tpl" . | include "helm-toolkit.utils.configmap_templater" }} - compute.filters: |+ + compute.filters: | {{- tuple .Values.conf.rootwrap_filters.compute "etc/rootwrap.d/_compute.filters.tpl" . | include "helm-toolkit.utils.configmap_templater" }} - network.filters: |+ + network.filters: | {{- tuple .Values.conf.rootwrap_filters.network "etc/rootwrap.d/_network.filters.tpl" . | include "helm-toolkit.utils.configmap_templater" }} - nova.conf: |+ + nova.conf: | {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.nova | indent 4 }} - nova-ironic.conf: |+ + nova-ironic.conf: | {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.nova_ironic | indent 4 }} - wsgi-nova-placement.conf: |+ + wsgi-nova-placement.conf: | {{- tuple .Values.conf.wsgi_placement "etc/_wsgi-nova-placement.conf.tpl" . | include "helm-toolkit.utils.configmap_templater" }} - ssh-config.sh: |+ + ssh-config.sh: | {{- tuple .Values.conf.ssh "etc/_ssh-config.tpl" . | include "helm-toolkit.utils.configmap_templater" }} {{- end }} {{- end }} diff --git a/openvswitch/templates/configmap-bin.yaml b/openvswitch/templates/configmap-bin.yaml index 43fc8fb2df..19bdfa8902 100644 --- a/openvswitch/templates/configmap-bin.yaml +++ b/openvswitch/templates/configmap-bin.yaml @@ -22,10 +22,10 @@ kind: ConfigMap metadata: name: openvswitch-bin data: - openvswitch-db-server.sh: |+ + openvswitch-db-server.sh: | {{ tuple "bin/_openvswitch-db-server.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} - openvswitch-vswitchd.sh: |+ + openvswitch-vswitchd.sh: | {{ tuple "bin/_openvswitch-vswitchd.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} - openvswitch-vswitchd-init-modules.sh: |+ + openvswitch-vswitchd-init-modules.sh: | {{ tuple "bin/_openvswitch-vswitchd-init-modules.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} {{- end }} diff --git a/rally/templates/configmap-bin.yaml b/rally/templates/configmap-bin.yaml index ee5d69abae..9b1ed363ad 100644 --- a/rally/templates/configmap-bin.yaml +++ b/rally/templates/configmap-bin.yaml @@ -23,7 +23,7 @@ metadata: name: rally-bin data: {{- if .Values.bootstrap.enabled }} - bootstrap.sh: |+ + bootstrap.sh: | {{ tuple "bin/_bootstrap.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} {{- end }} db-init.py: | diff --git a/rally/templates/configmap-etc.yaml b/rally/templates/configmap-etc.yaml index b6d07c0cb6..9b235cac1a 100644 --- a/rally/templates/configmap-etc.yaml +++ b/rally/templates/configmap-etc.yaml @@ -55,6 +55,6 @@ kind: ConfigMap metadata: name: rally-etc data: - rally.conf: |+ + rally.conf: | {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.rally | indent 4 }} {{- end }} diff --git a/rally/templates/configmap-tasks.yaml b/rally/templates/configmap-tasks.yaml index d0bcfb76e7..53dd00976f 100644 --- a/rally/templates/configmap-tasks.yaml +++ b/rally/templates/configmap-tasks.yaml @@ -22,26 +22,26 @@ kind: ConfigMap metadata: name: rally-tasks data: - authenticate.yaml: |+ + authenticate.yaml: | {{ toYaml .Values.conf.rally_tasks.authenticate_task | indent 4 }} - ceilometer.yaml: |+ + ceilometer.yaml: | {{ toYaml .Values.conf.rally_tasks.ceilometer_task | indent 4 }} - cinder.yaml: |+ + cinder.yaml: | {{ toYaml .Values.conf.rally_tasks.cinder_task | indent 4 }} - glance.yaml: |+ + glance.yaml: | {{ toYaml .Values.conf.rally_tasks.glance_task | indent 4 }} - heat.yaml: |+ + heat.yaml: | {{ toYaml .Values.conf.rally_tasks.heat_task | indent 4 }} - keystone.yaml: |+ + keystone.yaml: | {{ toYaml .Values.conf.rally_tasks.keystone_task | indent 4 }} - magnum.yaml: |+ + magnum.yaml: | {{ toYaml .Values.conf.rally_tasks.magnum_task | indent 4 }} - neutron.yaml: |+ + neutron.yaml: | {{ toYaml .Values.conf.rally_tasks.neutron_task | indent 4 }} - nova.yaml: |+ + nova.yaml: | {{ toYaml .Values.conf.rally_tasks.nova_task | indent 4 }} - senlin.yaml: |+ + senlin.yaml: | {{ toYaml .Values.conf.rally_tasks.senlin_task | indent 4 }} - swift.yaml: |+ + swift.yaml: | {{ toYaml .Values.conf.rally_tasks.swift_task | indent 4 }} {{- end }} diff --git a/rally/templates/configmap-test-templates.yaml b/rally/templates/configmap-test-templates.yaml index fa4e141bfc..ca4ef031fa 100644 --- a/rally/templates/configmap-test-templates.yaml +++ b/rally/templates/configmap-test-templates.yaml @@ -22,34 +22,34 @@ kind: ConfigMap metadata: name: heat-tasks-test-templates data: - random-strings.yaml: |+ + random-strings.yaml: | {{- tuple .Values.conf.rally_tasks.heat_tests.random_strings "tasks/test-templates/_random-strings.yaml.template.tpl" . | include "helm-toolkit.utils.configmap_templater" }} - updated-random-strings-replace.yaml: |+ + updated-random-strings-replace.yaml: | {{- tuple .Values.conf.rally_tasks.heat_tests.updated_random_strings_replace "tasks/test-templates/_updated-random-strings-replace.yaml.template.tpl" . | include "helm-toolkit.utils.configmap_templater" }} - updated-random-strings-add.yaml: |+ + updated-random-strings-add.yaml: | {{- tuple .Values.conf.rally_tasks.heat_tests.updated_random_strings_add "tasks/test-templates/_updated-random-strings-add.yaml.template.tpl" . | include "helm-toolkit.utils.configmap_templater" }} - updated-random-strings-delete.yaml: |+ + updated-random-strings-delete.yaml: | {{- tuple .Values.conf.rally_tasks.heat_tests.updated_random_strings_delete "tasks/test-templates/_updated-random-strings-delete.yaml.template.tpl" . | include "helm-toolkit.utils.configmap_templater" }} - resource-group-with-constraint.yaml: |+ + resource-group-with-constraint.yaml: | {{- tuple .Values.conf.rally_tasks.heat_tests.resource_group_with_constraint "tasks/test-templates/_resource-group-with-constraint.yaml.template.tpl" . | include "helm-toolkit.utils.configmap_templater" }} - resource-group-with-outputs.yaml: |+ + resource-group-with-outputs.yaml: | {{- tuple .Values.conf.rally_tasks.heat_tests.resource_group_with_outputs "tasks/test-templates/_resource-group-with-outputs.yaml.template.tpl" . | include "helm-toolkit.utils.configmap_templater" }} - resource-group-server-with-volume.yaml: |+ + resource-group-server-with-volume.yaml: | {{- tuple .Values.conf.rally_tasks.heat_tests.resource_group_server_with_volume "tasks/test-templates/_resource-group-server-with-volume.yaml.template.tpl" . | include "helm-toolkit.utils.configmap_templater" }} - resource-group.yaml: |+ + resource-group.yaml: | {{- tuple .Values.conf.rally_tasks.heat_tests.resource_group "tasks/test-templates/_resource-group.yaml.template.tpl" . | include "helm-toolkit.utils.configmap_templater" }} - default.yaml: |+ + default.yaml: | {{- tuple .Values.conf.rally_tasks.heat_tests.default "tasks/test-templates/_default.yaml.template.tpl" . | include "helm-toolkit.utils.configmap_templater" }} - autoscaling-group.yaml: |+ + autoscaling-group.yaml: | {{- tuple .Values.conf.rally_tasks.heat_tests.autoscaling_group "tasks/test-templates/_autoscaling-group.yaml.template.tpl" . | include "helm-toolkit.utils.configmap_templater" }} - autoscaling-policy.yaml: |+ + autoscaling-policy.yaml: | {{- tuple .Values.conf.rally_tasks.heat_tests.autoscaling_policy "tasks/test-templates/_autoscaling-policy.yaml.template.tpl" . | include "helm-toolkit.utils.configmap_templater" }} - server-with-ports.yaml: |+ + server-with-ports.yaml: | {{- tuple .Values.conf.rally_tasks.heat_tests.server_with_ports "tasks/test-templates/_server-with-ports.yaml.template.tpl" . | include "helm-toolkit.utils.configmap_templater" }} - server-with-volume.yaml: |+ + server-with-volume.yaml: | {{- tuple .Values.conf.rally_tasks.heat_tests.server_with_volume "tasks/test-templates/_server-with-volume.yaml.template.tpl" . | include "helm-toolkit.utils.configmap_templater" }} - updated-resource-group-increase.yaml: |+ + updated-resource-group-increase.yaml: | {{- tuple .Values.conf.rally_tasks.heat_tests.updated_resource_group_increase "tasks/test-templates/_updated-resource-group-increase.yaml.template.tpl" . | include "helm-toolkit.utils.configmap_templater" }} - updated-resource-group-reduce.yaml: |+ + updated-resource-group-reduce.yaml: | {{- tuple .Values.conf.rally_tasks.heat_tests.updated_resource_group_reduce "tasks/test-templates/_updated-resource-group-reduce.yaml.template.tpl" . | include "helm-toolkit.utils.configmap_templater" }} {{- end }} diff --git a/senlin/templates/configmap-bin.yaml b/senlin/templates/configmap-bin.yaml index 2aff8efa3a..2d89780fb3 100644 --- a/senlin/templates/configmap-bin.yaml +++ b/senlin/templates/configmap-bin.yaml @@ -23,20 +23,20 @@ metadata: name: senlin-bin data: {{- if .Values.bootstrap.enabled }} - bootstrap.sh: |+ + bootstrap.sh: | {{ tuple "bin/_bootstrap.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} {{- end }} db-init.py: | {{- include "helm-toolkit.scripts.db_init" . | indent 4 }} db-sync.sh: | {{ tuple "bin/_db-sync.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} - db-drop.py: |+ + db-drop.py: | {{- include "helm-toolkit.scripts.db_drop" . | indent 4 }} - ks-service.sh: |+ + ks-service.sh: | {{- include "helm-toolkit.scripts.keystone_service" . | indent 4 }} - ks-endpoints.sh: |+ + ks-endpoints.sh: | {{- include "helm-toolkit.scripts.keystone_endpoints" . | indent 4 }} - ks-user.sh: |+ + ks-user.sh: | {{- include "helm-toolkit.scripts.keystone_user" . | indent 4 }} senlin-api.sh: | {{ tuple "bin/_senlin-api.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} diff --git a/senlin/templates/configmap-etc.yaml b/senlin/templates/configmap-etc.yaml index 9f5892016f..aa32fcd676 100644 --- a/senlin/templates/configmap-etc.yaml +++ b/senlin/templates/configmap-etc.yaml @@ -68,10 +68,10 @@ kind: ConfigMap metadata: name: senlin-etc data: - senlin.conf: |+ + senlin.conf: | {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.senlin | indent 4 }} - api-paste.ini: |+ + api-paste.ini: | {{ include "helm-toolkit.utils.to_ini" .Values.conf.paste | indent 4 }} - policy.json: |+ + policy.json: | {{ toJson .Values.conf.policy | indent 4 }} {{- end }}