Skip to content

Commit ddaf5e8

Browse files
committed
Fix line splitting
1 parent 916aff4 commit ddaf5e8

2 files changed

Lines changed: 6 additions & 6 deletions

File tree

tests/roles/barbican_adoption/tasks/main.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
{{ shell_header }}
44
{{ oc_header }}
55
CONTROLLER1_SSH="{{ controller1_ssh }}"
6-
oc set data secret/osp-secret \
7-
"BarbicanSimpleCryptoKEK=$($CONTROLLER1_SSH \
8-
"sudo python3 -c \"import configparser; c = configparser.ConfigParser(); \
9-
c.read('/var/lib/config-data/puppet-generated/barbican/etc/barbican/barbican.conf'); print(c['simple_crypto_plugin']['kek'])\"")"
6+
oc set data secret/osp-secret "BarbicanSimpleCryptoKEK=$($CONTROLLER1_SSH \
7+
"sudo python3 -c \"import configparser; c = configparser.ConfigParser(); \
8+
c.read('/var/lib/config-data/puppet-generated/barbican/etc/barbican/barbican.conf'); \
9+
print(c['simple_crypto_plugin']['kek'])\"")"
1010
1111
- name: deploy podified Barbican
1212
ansible.builtin.shell: |

tests/roles/ovn_adoption/tasks/main.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -244,9 +244,9 @@
244244
{{ ovn_copy_shell_vars }}
245245
246246
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 \
247-
--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"
247+
--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"
248248
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 \
249-
--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"
249+
--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"
250250
when: enable_tlse|bool
251251

252252
- name: restore OVN database backups to podified ovsdb-servers

0 commit comments

Comments
 (0)