Merge pull request #1201 from archana203/yamllint

Fix the line-length warnings and enable yamllint strict mode

Author: openshift-merge-bot[bot]

.github/workflows/sync_branches_with_ext_trigger.yml

@@ -1,6 +1,6 @@
 ---
 name: Sync a target branch with source branch
-on:
+on: # yamllint disable-line rule:truthy
   repository_dispatch:
     types: [trigger-sync]
 

.pre-commit-config.yaml

@@ -36,3 +36,8 @@ repos:
         # E040: Syntax error determined using `bash -n` (as many scripts
         #       use jinja templating, this will often fail and the syntax
         #       error will be discovered in execution anyway)
+  - repo: https://github.com/adrienverge/yamllint.git
+    rev: v1.38.0
+    hooks:
+      - id: yamllint
+        args: [-s]

tests/roles/barbican_adoption/tasks/main.yaml

@@ -3,7 +3,10 @@
     {{ shell_header }}
     {{ oc_header }}
     CONTROLLER1_SSH="{{ controller1_ssh }}"
-    oc set data secret/osp-secret "BarbicanSimpleCryptoKEK=$($CONTROLLER1_SSH "sudo python3 -c \"import configparser; c = configparser.ConfigParser(); c.read('/var/lib/config-data/puppet-generated/barbican/etc/barbican/barbican.conf'); print(c['simple_crypto_plugin']['kek'])\"")"
+    oc set data secret/osp-secret "BarbicanSimpleCryptoKEK=$($CONTROLLER1_SSH \
+    "sudo python3 -c \"import configparser; c = configparser.ConfigParser(); \
+    c.read('/var/lib/config-data/puppet-generated/barbican/etc/barbican/barbican.conf'); \
+    print(c['simple_crypto_plugin']['kek'])\"")"
 
 - name: Create HSM login secret for Barbican
   when: barbican_hsm_enabled|default(false)

tests/roles/common_defaults/defaults/main.yaml

@@ -148,7 +148,9 @@ mariadb_copy_shell_vars_src: |-
   MARIADB_CLIENT_ANNOTATIONS={{ deploy_ctlplane_ospdo | default(false) | bool | ternary('-n $NAMESPACE', mariadb_client_network_annotation) }}
   MARIADB_RUN_OVERRIDES={{ deploy_ctlplane_ospdo | default(false) | bool | ternary("--overrides=${RUN_OVERRIDES} $MARIADB_CLIENT_ANNOTATIONS {{ mysql_client_override }}", "$MARIADB_CLIENT_ANNOTATIONS") }}
 
-  OSPDO_MARIADB_CLIENT_ANNOTATIONS='[{"name": "internalapi-static","ips": ["{% if ipv6_enabled | default(false) %}{{ internalapi_prefix_ipv6 | default('2620:cf:cf:bbbb') }}::99/64{% else %}{{ internalapi_prefix | default('172.17.0') }}.99/24{% endif %}"]}]'
+  OSPDO_MARIADB_CLIENT_ANNOTATIONS='[{"name": "internalapi-static","ips": \
+  ["{% if ipv6_enabled | default(false) %}{{ internalapi_prefix_ipv6 | default('2620:cf:cf:bbbb') }}::99/64\
+  {% else %}{{ internalapi_prefix | default('172.17.0') }}.99/24{% endif %}"]}]'
 
   {{ pull_openstack_configuration_ssh_shell_vars }}
 

tests/roles/dataplane_adoption/defaults/main.yaml

@@ -206,7 +206,20 @@ edpm_network_config_template_bgp: |
   {% endraw %}
 neutron_physical_bridge_name: br-ctlplane
 neutron_public_interface_name: "{{ dataplane_public_iface | default('eth0') }}"
-edpm_sshd_allowed_ranges: "{% if ipv6_enabled | default(false) %}{{ [ctlplane_prefix_ipv6 | default('fd00:aaaa') + '::/64'] if dataplane_os_net_config_set_route|default(true)|bool else ['::/0'] }}{% else %}{{ [ctlplane_prefix | default('192.168.122') + '.0/24'] if dataplane_os_net_config_set_route|default(true)|bool else ['0.0.0.0/0'] }}{% endif %}"
+edpm_sshd_allowed_ranges: >
+  {% if ipv6_enabled | default(false) %}
+    {{
+      [ctlplane_prefix_ipv6 | default('fd00:aaaa') + '::/64']
+      if dataplane_os_net_config_set_route|default(true)|bool
+      else ['::/0']
+    }}
+  {% else %}
+    {{
+      [ctlplane_prefix | default('192.168.122') + '.0/24']
+      if dataplane_os_net_config_set_route|default(true)|bool
+      else ['0.0.0.0/0']
+    }}
+  {% endif %}
 edpm_neutron_sriov_agent_enabled: true
 edpm_neutron_dhcp_agent_enabled: true
 nova_libvirt_backend: local

tests/roles/ovn_adoption/tasks/main.yaml

@@ -243,8 +243,10 @@
     {{ oc_header }}
     {{ ovn_copy_shell_vars }}
 
-    oc exec ovn-copy-data -- bash -c "ovsdb-client get-schema --ca-cert=/etc/pki/tls/misc/ca.crt --private-key=/etc/pki/tls/misc/tls.key --certificate=/etc/pki/tls/misc/tls.crt ssl:$PODIFIED_OVSDB_NB_IP:6641 > /backup/ovs-nb.ovsschema && ovsdb-tool convert /backup/ovs-nb.db /backup/ovs-nb.ovsschema"
-    oc exec ovn-copy-data -- bash -c "ovsdb-client get-schema --ca-cert=/etc/pki/tls/misc/ca.crt --private-key=/etc/pki/tls/misc/tls.key --certificate=/etc/pki/tls/misc/tls.crt ssl:$PODIFIED_OVSDB_SB_IP:6642 > /backup/ovs-sb.ovsschema && ovsdb-tool convert /backup/ovs-sb.db /backup/ovs-sb.ovsschema"
+    oc exec ovn-copy-data -- bash -c "ovsdb-client get-schema --ca-cert=/etc/pki/tls/misc/ca.crt --private-key=/etc/pki/tls/misc/tls.key \
+    --certificate=/etc/pki/tls/misc/tls.crt ssl:$PODIFIED_OVSDB_NB_IP:6641 > /backup/ovs-nb.ovsschema && ovsdb-tool convert /backup/ovs-nb.db /backup/ovs-nb.ovsschema"
+    oc exec ovn-copy-data -- bash -c "ovsdb-client get-schema --ca-cert=/etc/pki/tls/misc/ca.crt --private-key=/etc/pki/tls/misc/tls.key \
+    --certificate=/etc/pki/tls/misc/tls.crt ssl:$PODIFIED_OVSDB_SB_IP:6642 > /backup/ovs-sb.ovsschema && ovsdb-tool convert /backup/ovs-sb.db /backup/ovs-sb.ovsschema"
   when: enable_tlse|bool
 
 - name: restore OVN database backups to podified ovsdb-servers