From adc22b613b652d70844d719d268c778ee8db2fab Mon Sep 17 00:00:00 2001 From: Vladimir Kozhukalov Date: Wed, 12 Mar 2025 17:09:27 -0500 Subject: [PATCH] Update yamllint.conf This PR updates the yaml linter configuration to align it with what we have in the osh-infra repo. Change-Id: I3585fdc6663b2ae7bfb5c1d8a13672ac3055bf86 --- aodh/Chart.yaml | 2 ++ barbican/Chart.yaml | 2 ++ ceilometer/Chart.yaml | 2 ++ cinder/Chart.yaml | 2 ++ cyborg/Chart.yaml | 2 ++ cyborg/values.yaml | 1 + designate/Chart.yaml | 2 ++ glance/Chart.yaml | 2 ++ heat/Chart.yaml | 2 ++ horizon/Chart.yaml | 2 ++ ironic/Chart.yaml | 2 ++ keystone/Chart.yaml | 2 ++ magnum/Chart.yaml | 2 ++ manila/Chart.yaml | 2 ++ masakari/Chart.yaml | 2 ++ masakari/values.yaml | 1 + mistral/Chart.yaml | 2 ++ monasca/Chart.yaml | 2 ++ neutron/Chart.yaml | 2 ++ nova/Chart.yaml | 2 ++ octavia/Chart.yaml | 2 ++ openstack/Chart.yaml | 2 ++ openstack/values.yaml | 2 ++ placement/Chart.yaml | 2 ++ rally/Chart.yaml | 2 ++ ...nge-memcache-backend-2d85a3c75b32db39.yaml | 1 + ...ease-default-logging-31db0e9d3e51b429.yaml | 1 + .../notes/keystone-9bca09a40cc3dc68.yaml | 1 + .../notes/other-23a753cb53b10bb8.yaml | 1 + .../notes/rename-ceph-rbd-pool-app-name.yaml | 1 + tacker/Chart.yaml | 2 ++ tacker/values.yaml | 1 + tempest/Chart.yaml | 2 ++ tempest/templates/configmap-etc.yaml | 30 ++++++++++--------- tests/dns-test.yaml | 2 ++ tests/pvc-test.yaml | 2 ++ .../baremetal/heat-basic-bm-deployment.yaml | 2 ++ .../common/heat-basic-vm-deployment.yaml | 2 ++ .../common/heat-public-net-deployment.yaml | 2 ++ .../common/heat-subnet-pool-deployment.yaml | 2 ++ .../common/heat-vm-volume-attach.yaml | 2 ++ tools/deployment/common/rally-reports.yaml | 2 ++ .../gate/playbooks/deploy-env-kubespray.yaml | 2 ++ tools/gate/playbooks/deploy-env.yaml | 2 ++ tools/gate/playbooks/inject-keys.yaml | 2 ++ tools/gate/playbooks/osh-bandit.yaml | 2 ++ .../playbooks/osh-infra-collect-logs.yaml | 2 ++ tools/gate/playbooks/prepare-hosts.yaml | 2 ++ .../cinder/nfs-cinder-backup.yaml | 1 + .../glance/bootstrap-ubuntu-image.yaml | 2 ++ values_overrides/horizon/logo.yaml | 2 ++ values_overrides/ironic/standalone.yaml | 2 ++ values_overrides/neutron/bagpipe_bgp.yaml | 1 + values_overrides/neutron/l2gateway.yaml | 1 + values_overrides/neutron/ovn.yaml | 1 + values_overrides/neutron/ovn_vpn.yaml | 1 + values_overrides/nova/ovn.yaml | 2 ++ values_overrides/nova/ssh.yaml | 1 + .../tacker/2023.1-ubuntu_focal.yaml | 2 ++ .../tacker/2023.1-ubuntu_jammy.yaml | 2 ++ .../tacker/2023.2-ubuntu_jammy.yaml | 2 ++ .../tacker/2024.1-ubuntu_jammy.yaml | 2 ++ .../tacker/2024.2-ubuntu_jammy.yaml | 2 ++ values_overrides/tacker/zed-ubuntu_focal.yaml | 2 ++ values_overrides/tacker/zed-ubuntu_jammy.yaml | 2 ++ yamllint-templates.conf | 4 +-- yamllint.conf | 6 ++-- zuul.d/2023.2.yaml | 1 + zuul.d/2024.1.yaml | 1 + zuul.d/2024.2.yaml | 1 + zuul.d/base.yaml | 1 + zuul.d/nodesets.yaml | 1 + zuul.d/project.yaml | 1 + 73 files changed, 141 insertions(+), 19 deletions(-) diff --git a/aodh/Chart.yaml b/aodh/Chart.yaml index 8b7ef8485a..ef32a59fda 100644 --- a/aodh/Chart.yaml +++ b/aodh/Chart.yaml @@ -12,6 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +--- apiVersion: v2 appVersion: v1.0.0 description: Openstack-Helm Aodh @@ -28,3 +29,4 @@ dependencies: - name: helm-toolkit repository: file://../../openstack-helm-infra/helm-toolkit version: ">= 0.1.0" +... diff --git a/barbican/Chart.yaml b/barbican/Chart.yaml index 31c14db194..14ce962bc9 100644 --- a/barbican/Chart.yaml +++ b/barbican/Chart.yaml @@ -10,6 +10,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +--- apiVersion: v2 appVersion: v1.0.0 description: OpenStack-Helm Barbican @@ -27,3 +28,4 @@ dependencies: - name: helm-toolkit repository: file://../../openstack-helm-infra/helm-toolkit version: ">= 0.1.0" +... diff --git a/ceilometer/Chart.yaml b/ceilometer/Chart.yaml index 7006f638e8..1764c88149 100644 --- a/ceilometer/Chart.yaml +++ b/ceilometer/Chart.yaml @@ -10,6 +10,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +--- apiVersion: v2 appVersion: v1.0.0 description: OpenStack-Helm Ceilometer @@ -26,3 +27,4 @@ dependencies: - name: helm-toolkit repository: file://../../openstack-helm-infra/helm-toolkit version: ">= 0.1.0" +... diff --git a/cinder/Chart.yaml b/cinder/Chart.yaml index 8b0acfd5aa..07ef163d1f 100644 --- a/cinder/Chart.yaml +++ b/cinder/Chart.yaml @@ -10,6 +10,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +--- apiVersion: v2 appVersion: v1.0.0 description: OpenStack-Helm Cinder @@ -27,3 +28,4 @@ dependencies: - name: helm-toolkit repository: file://../../openstack-helm-infra/helm-toolkit version: ">= 0.1.0" +... diff --git a/cyborg/Chart.yaml b/cyborg/Chart.yaml index 8e337c820e..640a014ff1 100644 --- a/cyborg/Chart.yaml +++ b/cyborg/Chart.yaml @@ -10,6 +10,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +--- apiVersion: v2 appVersion: v1.0.0 description: OpenStack-Helm Cyborg @@ -27,3 +28,4 @@ dependencies: - name: helm-toolkit repository: file://../../openstack-helm-infra/helm-toolkit version: ">= 0.1.0" +... diff --git a/cyborg/values.yaml b/cyborg/values.yaml index 96dde03074..1b9eef07e2 100644 --- a/cyborg/values.yaml +++ b/cyborg/values.yaml @@ -571,3 +571,4 @@ manifests: secret_registry: true service_ingress_api: false service_api: true +... diff --git a/designate/Chart.yaml b/designate/Chart.yaml index 2a90d1a45d..e8a262e259 100644 --- a/designate/Chart.yaml +++ b/designate/Chart.yaml @@ -10,6 +10,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +--- apiVersion: v2 appVersion: v1.0.0 description: OpenStack-Helm Designate @@ -27,3 +28,4 @@ dependencies: - name: helm-toolkit repository: file://../../openstack-helm-infra/helm-toolkit version: ">= 0.1.0" +... diff --git a/glance/Chart.yaml b/glance/Chart.yaml index 96f738ab1f..cc55356acf 100644 --- a/glance/Chart.yaml +++ b/glance/Chart.yaml @@ -10,6 +10,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +--- apiVersion: v2 appVersion: v1.0.0 description: OpenStack-Helm Glance @@ -27,3 +28,4 @@ dependencies: - name: helm-toolkit repository: file://../../openstack-helm-infra/helm-toolkit version: ">= 0.1.0" +... diff --git a/heat/Chart.yaml b/heat/Chart.yaml index ca64d39441..34e8476d1a 100644 --- a/heat/Chart.yaml +++ b/heat/Chart.yaml @@ -10,6 +10,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +--- apiVersion: v2 appVersion: v1.0.0 description: OpenStack-Helm Heat @@ -27,3 +28,4 @@ dependencies: - name: helm-toolkit repository: file://../../openstack-helm-infra/helm-toolkit version: ">= 0.1.0" +... diff --git a/horizon/Chart.yaml b/horizon/Chart.yaml index 7b8e6d82ac..f5b44a3707 100644 --- a/horizon/Chart.yaml +++ b/horizon/Chart.yaml @@ -10,6 +10,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +--- apiVersion: v2 appVersion: v1.0.0 description: OpenStack-Helm Horizon @@ -27,3 +28,4 @@ dependencies: - name: helm-toolkit repository: file://../../openstack-helm-infra/helm-toolkit version: ">= 0.1.0" +... diff --git a/ironic/Chart.yaml b/ironic/Chart.yaml index e175f7cef7..b520a0be21 100644 --- a/ironic/Chart.yaml +++ b/ironic/Chart.yaml @@ -10,6 +10,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +--- apiVersion: v2 appVersion: v1.0.0 description: OpenStack-Helm Ironic @@ -27,3 +28,4 @@ dependencies: - name: helm-toolkit repository: file://../../openstack-helm-infra/helm-toolkit version: ">= 0.1.0" +... diff --git a/keystone/Chart.yaml b/keystone/Chart.yaml index 02ded8f92c..bed8be3207 100644 --- a/keystone/Chart.yaml +++ b/keystone/Chart.yaml @@ -10,6 +10,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +--- apiVersion: v2 appVersion: v1.0.0 description: OpenStack-Helm Keystone @@ -27,3 +28,4 @@ dependencies: - name: helm-toolkit repository: file://../../openstack-helm-infra/helm-toolkit version: ">= 0.1.0" +... diff --git a/magnum/Chart.yaml b/magnum/Chart.yaml index 73bdb51ea2..bd7abd0e1f 100644 --- a/magnum/Chart.yaml +++ b/magnum/Chart.yaml @@ -10,6 +10,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +--- apiVersion: v2 appVersion: v1.0.0 description: OpenStack-Helm Magnum @@ -27,3 +28,4 @@ dependencies: - name: helm-toolkit repository: file://../../openstack-helm-infra/helm-toolkit version: ">= 0.1.0" +... diff --git a/manila/Chart.yaml b/manila/Chart.yaml index 9ba72b1470..17754f57d0 100644 --- a/manila/Chart.yaml +++ b/manila/Chart.yaml @@ -10,6 +10,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +--- apiVersion: v2 appVersion: v1.0.0 description: OpenStack-Helm Manila @@ -27,3 +28,4 @@ dependencies: - name: helm-toolkit repository: file://../../openstack-helm-infra/helm-toolkit version: ">= 0.1.0" +... diff --git a/masakari/Chart.yaml b/masakari/Chart.yaml index 3c8ff19372..6046d1c471 100644 --- a/masakari/Chart.yaml +++ b/masakari/Chart.yaml @@ -10,6 +10,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +--- apiVersion: v2 appVersion: v1.0.0 description: OpenStack-Helm Masakari @@ -28,3 +29,4 @@ dependencies: - name: helm-toolkit repository: file://../../openstack-helm-infra/helm-toolkit version: ">= 0.1.0" +... diff --git a/masakari/values.yaml b/masakari/values.yaml index c082ff09bf..ac80ad84e2 100644 --- a/masakari/values.yaml +++ b/masakari/values.yaml @@ -627,3 +627,4 @@ manifests: host_monitor: false instance_monitor: false process_monitor: false +... diff --git a/mistral/Chart.yaml b/mistral/Chart.yaml index 3b8100e920..d527bd9ea5 100644 --- a/mistral/Chart.yaml +++ b/mistral/Chart.yaml @@ -10,6 +10,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +--- apiVersion: v2 appVersion: v1.0.0 description: OpenStack-Helm Mistral @@ -27,3 +28,4 @@ dependencies: - name: helm-toolkit repository: file://../../openstack-helm-infra/helm-toolkit version: ">= 0.1.0" +... diff --git a/monasca/Chart.yaml b/monasca/Chart.yaml index c1572b957c..d5eb5eaf41 100644 --- a/monasca/Chart.yaml +++ b/monasca/Chart.yaml @@ -10,6 +10,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +--- apiVersion: v2 appVersion: v1.0.0 description: OpenStack-Helm Monasca API @@ -27,3 +28,4 @@ dependencies: - name: helm-toolkit repository: "file://../../openstack-helm-infra/helm-toolkit" version: ">= 0.1.0" +... diff --git a/neutron/Chart.yaml b/neutron/Chart.yaml index 7e0d731db5..0bc46f3bb3 100644 --- a/neutron/Chart.yaml +++ b/neutron/Chart.yaml @@ -10,6 +10,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +--- apiVersion: v2 appVersion: v1.0.0 description: OpenStack-Helm Neutron @@ -27,3 +28,4 @@ dependencies: - name: helm-toolkit repository: file://../../openstack-helm-infra/helm-toolkit version: ">= 0.1.0" +... diff --git a/nova/Chart.yaml b/nova/Chart.yaml index c75b5562f7..77e94569e0 100644 --- a/nova/Chart.yaml +++ b/nova/Chart.yaml @@ -10,6 +10,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +--- apiVersion: v2 appVersion: v1.0.0 description: OpenStack-Helm Nova @@ -27,3 +28,4 @@ dependencies: - name: helm-toolkit repository: file://../../openstack-helm-infra/helm-toolkit version: ">= 0.1.0" +... diff --git a/octavia/Chart.yaml b/octavia/Chart.yaml index 3e19b80ced..b4e196839e 100644 --- a/octavia/Chart.yaml +++ b/octavia/Chart.yaml @@ -12,6 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +--- apiVersion: v2 appVersion: v1.0.0 description: OpenStack-Helm Octavia @@ -29,3 +30,4 @@ dependencies: - name: helm-toolkit repository: file://../../openstack-helm-infra/helm-toolkit version: ">= 0.1.0" +... diff --git a/openstack/Chart.yaml b/openstack/Chart.yaml index 935960f11c..f7b1b2febd 100644 --- a/openstack/Chart.yaml +++ b/openstack/Chart.yaml @@ -1,3 +1,4 @@ +--- apiVersion: v2 appVersion: 1.16.0 dependencies: @@ -60,3 +61,4 @@ type: application version: 2024.2.0 maintainers: - name: OpenStack-Helm Authors +... diff --git a/openstack/values.yaml b/openstack/values.yaml index 20f906f91f..c26ddf5433 100644 --- a/openstack/values.yaml +++ b/openstack/values.yaml @@ -7,6 +7,7 @@ # Since libvirt-default is deployed during install phase, neutron-ks-user must also # be installed during install phase instead of post-install phase. +--- global: subchart_release_name: true @@ -76,3 +77,4 @@ neutron: auto_bridge_add: # no idea why, but something with sub-charts and null values get ommitted entirely from sub chart br-ex: "null" +... diff --git a/placement/Chart.yaml b/placement/Chart.yaml index 38407be9fa..e0173a3c21 100644 --- a/placement/Chart.yaml +++ b/placement/Chart.yaml @@ -12,6 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +--- apiVersion: v2 appVersion: v1.0.0 description: OpenStack-Helm Placement @@ -29,3 +30,4 @@ dependencies: - name: helm-toolkit repository: file://../../openstack-helm-infra/helm-toolkit version: ">= 0.1.0" +... diff --git a/rally/Chart.yaml b/rally/Chart.yaml index 39d45c22de..6db3d6a9e8 100644 --- a/rally/Chart.yaml +++ b/rally/Chart.yaml @@ -10,6 +10,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +--- apiVersion: v2 appVersion: v1.0.0 description: OpenStack-Helm rally @@ -27,3 +28,4 @@ dependencies: - name: helm-toolkit repository: file://../../openstack-helm-infra/helm-toolkit version: ">= 0.1.0" +... diff --git a/releasenotes/notes/change-memcache-backend-2d85a3c75b32db39.yaml b/releasenotes/notes/change-memcache-backend-2d85a3c75b32db39.yaml index 75be1099bc..b4a0800726 100644 --- a/releasenotes/notes/change-memcache-backend-2d85a3c75b32db39.yaml +++ b/releasenotes/notes/change-memcache-backend-2d85a3c75b32db39.yaml @@ -4,3 +4,4 @@ other: memcache backend for nova has been changed from oslo_cache.memcache_pool to dogpile.cache.memcached. You can revert to previous behaviour by setting conf.nova.cache.backend to "oslo_cache.memcache_pool". +... diff --git a/releasenotes/notes/increase-default-logging-31db0e9d3e51b429.yaml b/releasenotes/notes/increase-default-logging-31db0e9d3e51b429.yaml index fabb49217d..9aa89c1916 100644 --- a/releasenotes/notes/increase-default-logging-31db0e9d3e51b429.yaml +++ b/releasenotes/notes/increase-default-logging-31db0e9d3e51b429.yaml @@ -4,3 +4,4 @@ other: The logging for barbican, cinder, congress, glance, heat, ironic, keystone, magnum, mistral, neutron, nova, and senlin has been increased to log all warnings (and above) to stdout by default. +... diff --git a/releasenotes/notes/keystone-9bca09a40cc3dc68.yaml b/releasenotes/notes/keystone-9bca09a40cc3dc68.yaml index bb40e46229..37bb444421 100644 --- a/releasenotes/notes/keystone-9bca09a40cc3dc68.yaml +++ b/releasenotes/notes/keystone-9bca09a40cc3dc68.yaml @@ -1,3 +1,4 @@ --- fixes: - Fix the number of max active fernet keys +... diff --git a/releasenotes/notes/other-23a753cb53b10bb8.yaml b/releasenotes/notes/other-23a753cb53b10bb8.yaml index 08a93c81e8..3e816c4c2c 100644 --- a/releasenotes/notes/other-23a753cb53b10bb8.yaml +++ b/releasenotes/notes/other-23a753cb53b10bb8.yaml @@ -6,3 +6,4 @@ other: Docker Hub registry and to Quay registry which has more tolerant rate limits which is more convenient for users with anonymous accounts. +... diff --git a/releasenotes/notes/rename-ceph-rbd-pool-app-name.yaml b/releasenotes/notes/rename-ceph-rbd-pool-app-name.yaml index b36fe19a7b..1e6672e337 100644 --- a/releasenotes/notes/rename-ceph-rbd-pool-app-name.yaml +++ b/releasenotes/notes/rename-ceph-rbd-pool-app-name.yaml @@ -5,3 +5,4 @@ other: conf.ceph.pools as app_name. This means that conf.software.rbd.rbd_pool_app_name is now conf.ceph.pools.cinder.volumes.app_name and conf.software.rbd.rbd_pool_app_name_backup is now conf.ceph.pools.backup.app_name. +... diff --git a/tacker/Chart.yaml b/tacker/Chart.yaml index a272595a68..711c8c15b4 100644 --- a/tacker/Chart.yaml +++ b/tacker/Chart.yaml @@ -10,6 +10,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +--- apiVersion: v2 appVersion: v1.0.0 description: OpenStack-Helm Tacker @@ -27,3 +28,4 @@ dependencies: - name: helm-toolkit repository: file://../../openstack-helm-infra/helm-toolkit version: ">= 0.1.0" +... diff --git a/tacker/values.yaml b/tacker/values.yaml index ba35190eee..64692cdd0b 100644 --- a/tacker/values.yaml +++ b/tacker/values.yaml @@ -14,6 +14,7 @@ # This is a YAML-formatted file. # Declare variables to be passed into your templates. +--- labels: server: node_selector_key: openstack-control-plane diff --git a/tempest/Chart.yaml b/tempest/Chart.yaml index 64744525ed..7681983c18 100644 --- a/tempest/Chart.yaml +++ b/tempest/Chart.yaml @@ -10,6 +10,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +--- apiVersion: v2 appVersion: v1.0.0 description: OpenStack-Helm Tempest @@ -27,3 +28,4 @@ dependencies: - name: helm-toolkit repository: file://../../openstack-helm-infra/helm-toolkit version: ">= 0.1.0" +... diff --git a/tempest/templates/configmap-etc.yaml b/tempest/templates/configmap-etc.yaml index 025a2701b1..760557c709 100644 --- a/tempest/templates/configmap-etc.yaml +++ b/tempest/templates/configmap-etc.yaml @@ -73,18 +73,20 @@ limitations under the License. {{- $endpointHost := tuple "dashboard" "public" . | include "helm-toolkit.endpoints.endpoint_host_lookup" }} {{- $endpointPort := tuple "dashboard" "public" "web" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }} {{- $endpointPath := tuple "dashboard" "public" "web" . | include "helm-toolkit.endpoints.keystone_endpoint_path_lookup" }} - # When CSRF protection is enabled Refferer and Host header should match. - # Common browsers doesn't add default ports like 80 and 443 to the headers - # Use the same logic here to make sure test passed when CSRF protection is enabled and - # we using default port numbers. More info may be found here: - # * https://code.djangoproject.com/ticket/26037 - # * https://stackoverflow.com/questions/27533011/django-csrf-error-casused-by-nginx-x-forwarded-host +{{/* +When CSRF protection is enabled Refferer and Host header should match. +Common browsers doesn't add default ports like 80 and 443 to the headers +Use the same logic here to make sure test passed when CSRF protection is enabled and +we using default port numbers. More info may be found here: +* https://code.djangoproject.com/ticket/26037 +* https://stackoverflow.com/questions/27533011/django-csrf-error-casused-by-nginx-x-forwarded-host +*/}} {{- if eq $endpointPort "80" "443" }} - {{- printf "%s://%s%s" $endpointScheme $endpointHost $endpointPath | set .Values.conf.tempest.dashboard "dashboard_url" }} + {{- $_ := set .Values.conf.tempest.dashboard "dashboard_url" (printf "%s://%s%s" $endpointScheme $endpointHost $endpointPath) }} {{- else }} - {{- printf "%s://%s:%s%s" $endpointScheme $endpointHost $endpointPort $endpointPath | set .Values.conf.tempest.dashboard "dashboard_url" }} + {{- $_ := set .Values.conf.tempest.dashboard "dashboard_url" (printf "%s://%s:%s%s" $endpointScheme $endpointHost $endpointPort $endpointPath) }} {{- end }} -{{- end -}} +{{- end }} --- apiVersion: v1 @@ -95,10 +97,10 @@ type: Opaque data: tempest.conf: {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.tempest | b64enc }} logging.conf: {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.tempest_logging | b64enc }} -{{ if not (empty .Values.conf.blacklist) }} +{{- if not (empty .Values.conf.blacklist) }} test-blacklist: {{ include "tempest.utils.to_regex_file" .Values.conf.blacklist | b64enc }} -{{ end }} -{{ if not (empty .Values.conf.whitelist) }} - test-whitelist: {{ include "tempest.utils.to_regex_file" .Values.conf.whitelist | b64enc }} -{{ end }} +{{- end }} +{{- if not (empty .Values.conf.whitelist) }} + test-whitelist: {{ include "tempest.utils.to_regex_file" .Values.conf.whitelist | b64enc }} +{{- end }} {{- end }} diff --git a/tests/dns-test.yaml b/tests/dns-test.yaml index f721b3245e..e48cc76446 100644 --- a/tests/dns-test.yaml +++ b/tests/dns-test.yaml @@ -10,6 +10,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +--- apiVersion: v1 kind: Pod metadata: @@ -24,3 +25,4 @@ spec: imagePullPolicy: IfNotPresent name: busybox restartPolicy: Always +... diff --git a/tests/pvc-test.yaml b/tests/pvc-test.yaml index 65f278eb7a..8599878432 100644 --- a/tests/pvc-test.yaml +++ b/tests/pvc-test.yaml @@ -38,6 +38,7 @@ spec: - name: ceph-mount persistentVolumeClaim: claimName: ceph-test +... --- kind: PersistentVolumeClaim apiVersion: v1 @@ -49,3 +50,4 @@ spec: resources: requests: storage: 1Gi +... diff --git a/tools/deployment/baremetal/heat-basic-bm-deployment.yaml b/tools/deployment/baremetal/heat-basic-bm-deployment.yaml index c414726d8b..b7286318ff 100644 --- a/tools/deployment/baremetal/heat-basic-bm-deployment.yaml +++ b/tools/deployment/baremetal/heat-basic-bm-deployment.yaml @@ -1,3 +1,4 @@ +--- heat_template_version: 2016-10-14 parameters: @@ -54,3 +55,4 @@ outputs: - fixed_ips - 0 - ip_address +... diff --git a/tools/deployment/common/heat-basic-vm-deployment.yaml b/tools/deployment/common/heat-basic-vm-deployment.yaml index 18c246c6a8..61a13195b6 100644 --- a/tools/deployment/common/heat-basic-vm-deployment.yaml +++ b/tools/deployment/common/heat-basic-vm-deployment.yaml @@ -1,3 +1,4 @@ +--- heat_template_version: '2021-04-16' parameters: @@ -166,3 +167,4 @@ outputs: - server - show - id +... diff --git a/tools/deployment/common/heat-public-net-deployment.yaml b/tools/deployment/common/heat-public-net-deployment.yaml index b308fb1e02..9bfc3cfb4e 100644 --- a/tools/deployment/common/heat-public-net-deployment.yaml +++ b/tools/deployment/common/heat-public-net-deployment.yaml @@ -1,3 +1,4 @@ +--- heat_template_version: 2016-10-14 parameters: @@ -57,3 +58,4 @@ resources: allocation_pools: - start: {get_param: allocation_pool_start} end: {get_param: allocation_pool_end} +... diff --git a/tools/deployment/common/heat-subnet-pool-deployment.yaml b/tools/deployment/common/heat-subnet-pool-deployment.yaml index 71952ee905..4d5d108b23 100644 --- a/tools/deployment/common/heat-subnet-pool-deployment.yaml +++ b/tools/deployment/common/heat-subnet-pool-deployment.yaml @@ -1,3 +1,4 @@ +--- heat_template_version: 2016-10-14 parameters: @@ -26,3 +27,4 @@ resources: get_param: subnet_pool_default_prefix_length prefixes: get_param: subnet_pool_prefixes +... diff --git a/tools/deployment/common/heat-vm-volume-attach.yaml b/tools/deployment/common/heat-vm-volume-attach.yaml index 1cad39ce0a..f00707d038 100644 --- a/tools/deployment/common/heat-vm-volume-attach.yaml +++ b/tools/deployment/common/heat-vm-volume-attach.yaml @@ -1,3 +1,4 @@ +--- heat_template_version: 2016-10-14 parameters: @@ -18,3 +19,4 @@ resources: get_param: instance_uuid volume_id: get_resource: cinder_volume +... diff --git a/tools/deployment/common/rally-reports.yaml b/tools/deployment/common/rally-reports.yaml index 3c11107e53..266592e744 100644 --- a/tools/deployment/common/rally-reports.yaml +++ b/tools/deployment/common/rally-reports.yaml @@ -1,3 +1,4 @@ +--- apiVersion: batch/v1 kind: Job metadata: @@ -29,3 +30,4 @@ spec: - name: rally-data hostPath: path: /tmp/rally-data +... diff --git a/tools/gate/playbooks/deploy-env-kubespray.yaml b/tools/gate/playbooks/deploy-env-kubespray.yaml index 38ead36325..bc9961d391 100644 --- a/tools/gate/playbooks/deploy-env-kubespray.yaml +++ b/tools/gate/playbooks/deploy-env-kubespray.yaml @@ -1,3 +1,4 @@ +--- - hosts: all become: true gather_facts: true @@ -142,3 +143,4 @@ when: - openstack_provider_gateway_setup - inventory_hostname in (groups['k8s_control_plane'] | default([])) +... diff --git a/tools/gate/playbooks/deploy-env.yaml b/tools/gate/playbooks/deploy-env.yaml index 13e1302216..5d5116c03b 100644 --- a/tools/gate/playbooks/deploy-env.yaml +++ b/tools/gate/playbooks/deploy-env.yaml @@ -1,5 +1,7 @@ +--- - hosts: all become: true gather_facts: true roles: - deploy-env +... diff --git a/tools/gate/playbooks/inject-keys.yaml b/tools/gate/playbooks/inject-keys.yaml index 59fec9d9ab..c9a85b2612 100644 --- a/tools/gate/playbooks/inject-keys.yaml +++ b/tools/gate/playbooks/inject-keys.yaml @@ -1,3 +1,4 @@ +--- - hosts: all tasks: - name: Put keys to .ssh/authorized_keys @@ -7,3 +8,4 @@ line: "{{ item }}" loop: - "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBMyM6sgu/Xgg+VaLJX5c6gy6ynYX7pO7XNobnKotYRulcEkmiLprvLSg+WP25VDAcSoif3rek3qiVnEYh6R2/Go= vlad@russell" +... diff --git a/tools/gate/playbooks/osh-bandit.yaml b/tools/gate/playbooks/osh-bandit.yaml index 6e41df8cef..9315ace8ae 100644 --- a/tools/gate/playbooks/osh-bandit.yaml +++ b/tools/gate/playbooks/osh-bandit.yaml @@ -1,5 +1,7 @@ +--- - hosts: primary roles: - ensure-python - ensure-pip - osh-bandit +... diff --git a/tools/gate/playbooks/osh-infra-collect-logs.yaml b/tools/gate/playbooks/osh-infra-collect-logs.yaml index e8dcca9dc6..b70b3bb855 100644 --- a/tools/gate/playbooks/osh-infra-collect-logs.yaml +++ b/tools/gate/playbooks/osh-infra-collect-logs.yaml @@ -10,6 +10,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +--- - hosts: all vars: work_dir: "{{ zuul.project.src_dir }}/{{ zuul_osh_infra_relative_path | default('') }}" @@ -54,3 +55,4 @@ - gather-prom-metrics tags: - gather-prom-metrics +... diff --git a/tools/gate/playbooks/prepare-hosts.yaml b/tools/gate/playbooks/prepare-hosts.yaml index 0c3556f5ba..2855c024fd 100644 --- a/tools/gate/playbooks/prepare-hosts.yaml +++ b/tools/gate/playbooks/prepare-hosts.yaml @@ -1,6 +1,8 @@ +--- - hosts: all roles: - start-zuul-console - ensure-python - ensure-pip - clear-firewall +... diff --git a/values_overrides/cinder/nfs-cinder-backup.yaml b/values_overrides/cinder/nfs-cinder-backup.yaml index 2c3fa50f64..0ec6ddb53b 100644 --- a/values_overrides/cinder/nfs-cinder-backup.yaml +++ b/values_overrides/cinder/nfs-cinder-backup.yaml @@ -1,3 +1,4 @@ +--- conf: cinder: DEFAULT: diff --git a/values_overrides/glance/bootstrap-ubuntu-image.yaml b/values_overrides/glance/bootstrap-ubuntu-image.yaml index dfdc7b7343..a7cca53d01 100644 --- a/values_overrides/glance/bootstrap-ubuntu-image.yaml +++ b/values_overrides/glance/bootstrap-ubuntu-image.yaml @@ -1,3 +1,4 @@ +--- bootstrap: structured: images: @@ -9,3 +10,4 @@ bootstrap: min_disk: 3 image_type: qcow2 container_format: bare +... diff --git a/values_overrides/horizon/logo.yaml b/values_overrides/horizon/logo.yaml index 88211882ea..562d6b9974 100644 --- a/values_overrides/horizon/logo.yaml +++ b/values_overrides/horizon/logo.yaml @@ -1,3 +1,4 @@ +--- manifests: configmap_logo: true conf: @@ -390,3 +391,4 @@ conf: MzU3LjI4IDM4MS4xMmgtMjYuMjV2LTI2LjI1aDI2LjI1djI2LjI1eiIgZmlsbD0iI2VkMTg0NCIv PgogICAgIDxwYXRoIGQ9Im00NDcuMjYgMzgxLjEyaC0yNi4yNXYtMjYuMjVoMjYuMjV2MjYuMjV6 IiBmaWxsPSIjZWQxODQ0Ii8+CiAgICA8L2c+CiAgIDwvZz4KICA8L2c+CiA8L2c+Cjwvc3ZnPgo= +... diff --git a/values_overrides/ironic/standalone.yaml b/values_overrides/ironic/standalone.yaml index 0cca81b0ee..929277fe6a 100644 --- a/values_overrides/ironic/standalone.yaml +++ b/values_overrides/ironic/standalone.yaml @@ -1,3 +1,4 @@ +--- conf: ironic: DEFAULT: @@ -58,3 +59,4 @@ manifests: job_ks_user: false job_manage_cleaning_network: false secret_keystone: false +... diff --git a/values_overrides/neutron/bagpipe_bgp.yaml b/values_overrides/neutron/bagpipe_bgp.yaml index ae2d8a95dd..29132dcfe3 100644 --- a/values_overrides/neutron/bagpipe_bgp.yaml +++ b/values_overrides/neutron/bagpipe_bgp.yaml @@ -32,3 +32,4 @@ conf: manifests: daemonset_bagpipe_bgp: true +... diff --git a/values_overrides/neutron/l2gateway.yaml b/values_overrides/neutron/l2gateway.yaml index 6e4fe10fe5..26f3703e18 100644 --- a/values_overrides/neutron/l2gateway.yaml +++ b/values_overrides/neutron/l2gateway.yaml @@ -23,3 +23,4 @@ conf: manifests: daemonset_l2gw_agent: true +... diff --git a/values_overrides/neutron/ovn.yaml b/values_overrides/neutron/ovn.yaml index b0a6b972ef..063823e465 100644 --- a/values_overrides/neutron/ovn.yaml +++ b/values_overrides/neutron/ovn.yaml @@ -29,3 +29,4 @@ manifests: deployment_rpc_server: false daemonset_ovn_metadata_agent: true +... diff --git a/values_overrides/neutron/ovn_vpn.yaml b/values_overrides/neutron/ovn_vpn.yaml index 50e53cbc04..eba1cd3ea2 100644 --- a/values_overrides/neutron/ovn_vpn.yaml +++ b/values_overrides/neutron/ovn_vpn.yaml @@ -32,3 +32,4 @@ manifests: daemonset_ovn_metadata_agent: true daemonset_ovn_vpn_agent: true +... diff --git a/values_overrides/nova/ovn.yaml b/values_overrides/nova/ovn.yaml index ee149545b5..07ebffb372 100644 --- a/values_overrides/nova/ovn.yaml +++ b/values_overrides/nova/ovn.yaml @@ -1,3 +1,4 @@ +--- dependencies: dynamic: targeted: @@ -10,3 +11,4 @@ conf: DEFAULT: vif_plugging_is_fatal: true vif_plugging_timeout: 300 +... diff --git a/values_overrides/nova/ssh.yaml b/values_overrides/nova/ssh.yaml index 4be54c279e..c5b7187882 100644 --- a/values_overrides/nova/ssh.yaml +++ b/values_overrides/nova/ssh.yaml @@ -32,3 +32,4 @@ network: 2NRGN9QbVYUvdwuRPd7C9wXQfLzXf0/E67oYg6fHHGTBNMjSq56qhZ2dSZnyQCxI UZu0B4/1A5493Mypxp8c2fPhBdfzjTA5latsr75U26OMPxCxgFxm1A== -----END RSA PRIVATE KEY----- +... diff --git a/values_overrides/tacker/2023.1-ubuntu_focal.yaml b/values_overrides/tacker/2023.1-ubuntu_focal.yaml index 143f5ae71e..0026c88d42 100644 --- a/values_overrides/tacker/2023.1-ubuntu_focal.yaml +++ b/values_overrides/tacker/2023.1-ubuntu_focal.yaml @@ -2,6 +2,7 @@ # This is a YAML-formatted file. # Declare variables to be passed into your templates. +--- images: tags: tacker_server: docker.io/openstackhelm/tacker:2023.1-ubuntu_focal @@ -12,3 +13,4 @@ images: ks_endpoints: docker.io/openstackhelm/heat:2023.1-ubuntu_focal ks_service: docker.io/openstackhelm/heat:2023.1-ubuntu_focal ks_user: docker.io/openstackhelm/heat:2023.1-ubuntu_focal +... diff --git a/values_overrides/tacker/2023.1-ubuntu_jammy.yaml b/values_overrides/tacker/2023.1-ubuntu_jammy.yaml index 838a1fd78b..06cae89b48 100644 --- a/values_overrides/tacker/2023.1-ubuntu_jammy.yaml +++ b/values_overrides/tacker/2023.1-ubuntu_jammy.yaml @@ -2,6 +2,7 @@ # This is a YAML-formatted file. # Declare variables to be passed into your templates. +--- images: tags: tacker_server: docker.io/openstackhelm/tacker:2023.1-ubuntu_jammy @@ -12,3 +13,4 @@ images: ks_endpoints: docker.io/openstackhelm/heat:2023.1-ubuntu_jammy ks_service: docker.io/openstackhelm/heat:2023.1-ubuntu_jammy ks_user: docker.io/openstackhelm/heat:2023.1-ubuntu_jammy +... diff --git a/values_overrides/tacker/2023.2-ubuntu_jammy.yaml b/values_overrides/tacker/2023.2-ubuntu_jammy.yaml index 316e5c02f2..d726b42704 100644 --- a/values_overrides/tacker/2023.2-ubuntu_jammy.yaml +++ b/values_overrides/tacker/2023.2-ubuntu_jammy.yaml @@ -2,6 +2,7 @@ # This is a YAML-formatted file. # Declare variables to be passed into your templates. +--- images: tags: tacker_server: quay.io/airshipit/tacker:2023.2-ubuntu_jammy @@ -12,3 +13,4 @@ images: ks_endpoints: quay.io/airshipit/heat:2023.2-ubuntu_jammy ks_service: quay.io/airshipit/heat:2023.2-ubuntu_jammy ks_user: quay.io/airshipit/heat:2023.2-ubuntu_jammy +... diff --git a/values_overrides/tacker/2024.1-ubuntu_jammy.yaml b/values_overrides/tacker/2024.1-ubuntu_jammy.yaml index 4b51875c4b..79e6b4d74e 100644 --- a/values_overrides/tacker/2024.1-ubuntu_jammy.yaml +++ b/values_overrides/tacker/2024.1-ubuntu_jammy.yaml @@ -2,6 +2,7 @@ # This is a YAML-formatted file. # Declare variables to be passed into your templates. +--- images: tags: tacker_server: quay.io/airshipit/tacker:2024.1-ubuntu_jammy @@ -12,3 +13,4 @@ images: ks_endpoints: quay.io/airshipit/heat:2024.1-ubuntu_jammy ks_service: quay.io/airshipit/heat:2024.1-ubuntu_jammy ks_user: quay.io/airshipit/heat:2024.1-ubuntu_jammy +... diff --git a/values_overrides/tacker/2024.2-ubuntu_jammy.yaml b/values_overrides/tacker/2024.2-ubuntu_jammy.yaml index 2a830e1b0b..63b7fe55a2 100644 --- a/values_overrides/tacker/2024.2-ubuntu_jammy.yaml +++ b/values_overrides/tacker/2024.2-ubuntu_jammy.yaml @@ -2,6 +2,7 @@ # This is a YAML-formatted file. # Declare variables to be passed into your templates. +--- images: tags: tacker_server: quay.io/airshipit/tacker:2024.2-ubuntu_jammy @@ -12,3 +13,4 @@ images: ks_endpoints: quay.io/airshipit/heat:2024.2-ubuntu_jammy ks_service: quay.io/airshipit/heat:2024.2-ubuntu_jammy ks_user: quay.io/airshipit/heat:2024.2-ubuntu_jammy +... diff --git a/values_overrides/tacker/zed-ubuntu_focal.yaml b/values_overrides/tacker/zed-ubuntu_focal.yaml index 69e4fc8af3..a5c4733a3d 100644 --- a/values_overrides/tacker/zed-ubuntu_focal.yaml +++ b/values_overrides/tacker/zed-ubuntu_focal.yaml @@ -2,6 +2,7 @@ # This is a YAML-formatted file. # Declare variables to be passed into your templates. +--- images: tags: tacker_server: docker.io/openstackhelm/tacker:zed-ubuntu_focal @@ -36,3 +37,4 @@ conf: composite:vnffm_v1: noauth: request_id catch_errors vnffmaapp_v1 keystone: request_id catch_errors authtoken keystonecontext vnffmaapp_v1 +... diff --git a/values_overrides/tacker/zed-ubuntu_jammy.yaml b/values_overrides/tacker/zed-ubuntu_jammy.yaml index 081c5a9b8c..1b382dde56 100644 --- a/values_overrides/tacker/zed-ubuntu_jammy.yaml +++ b/values_overrides/tacker/zed-ubuntu_jammy.yaml @@ -2,6 +2,7 @@ # This is a YAML-formatted file. # Declare variables to be passed into your templates. +--- images: tags: tacker_server: docker.io/openstackhelm/tacker:zed-ubuntu_jammy @@ -36,3 +37,4 @@ conf: composite:vnffm_v1: noauth: request_id catch_errors vnffmaapp_v1 keystone: request_id catch_errors authtoken keystonecontext vnffmaapp_v1 +... diff --git a/yamllint-templates.conf b/yamllint-templates.conf index d833c5b094..ba9fcdf012 100644 --- a/yamllint-templates.conf +++ b/yamllint-templates.conf @@ -11,9 +11,9 @@ rules: colons: enable commas: enable comments: enable - comments-indentation: disable + comments-indentation: enable document-end: disable - document-start: disable + document-start: enable empty-lines: disable empty-values: disable hyphens: enable diff --git a/yamllint.conf b/yamllint.conf index bd14375431..1aa5161851 100644 --- a/yamllint.conf +++ b/yamllint.conf @@ -12,12 +12,12 @@ rules: commas: enable comments: enable comments-indentation: disable - document-end: disable - document-start: disable + document-end: enable + document-start: enable empty-lines: enable empty-values: disable hyphens: - ignore: zuul.d/jobs-openstack-helm.yaml + ignore: .yamllint/zuul.d/jobs.yaml indentation: spaces: 2 indent-sequences: whatever diff --git a/zuul.d/2023.2.yaml b/zuul.d/2023.2.yaml index b1cfa0310e..d75bc9c5f0 100644 --- a/zuul.d/2023.2.yaml +++ b/zuul.d/2023.2.yaml @@ -73,3 +73,4 @@ container_distro_name: ubuntu container_distro_version: jammy feature_gates: ovn +... diff --git a/zuul.d/2024.1.yaml b/zuul.d/2024.1.yaml index a321e02ef1..c8e702a1d1 100644 --- a/zuul.d/2024.1.yaml +++ b/zuul.d/2024.1.yaml @@ -167,3 +167,4 @@ openstack_release: "2024.1" container_distro_name: ubuntu container_distro_version: jammy +... diff --git a/zuul.d/2024.2.yaml b/zuul.d/2024.2.yaml index db7e5ecc46..0af39b5239 100644 --- a/zuul.d/2024.2.yaml +++ b/zuul.d/2024.2.yaml @@ -114,3 +114,4 @@ openstack_release: "2024.2" container_distro_name: ubuntu container_distro_version: jammy +... diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml index f7f9306d92..320c7373bd 100644 --- a/zuul.d/base.yaml +++ b/zuul.d/base.yaml @@ -417,3 +417,4 @@ - ./tools/deployment/component/nfs-provisioner/nfs-provisioner.sh - ./tools/deployment/component/tacker/tacker.sh - ./tools/deployment/common/run-helm-tests.sh tacker +... diff --git a/zuul.d/nodesets.yaml b/zuul.d/nodesets.yaml index 0797be9875..4f09233828 100644 --- a/zuul.d/nodesets.yaml +++ b/zuul.d/nodesets.yaml @@ -389,3 +389,4 @@ - node-2 - node-3 - node-4 +... diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index b030e9cca2..feb625e415 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -55,3 +55,4 @@ jobs: - openstack-helm-compute-kit-helm-repo-public-2024-1-ubuntu_jammy # 1 node + 2 nodes - openstack-helm-compute-kit-rook-2024-1-ubuntu_jammy # 5 nodes / rook +...