mirror of https://github.com/ceph/ceph-ansible.git
Make python print statements python3 compatible
The restart_osd_daemon.sh generated from the j2 template contains a python call which uses 'print x' instead of 'print(x)'. Add the missing parentheses to make this call compatible with both 2 and 3. Also add parentheses to other python print calls found in roles/ceph-client/defaults/main.yml and infrastructure-playbooks/cluster-os-migration.yml. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1671721 Signed-off-by: John Fulton <fulton@redhat.com>pull/3569/head
parent
7b411b93d5
commit
37b5d1084a
|
@ -44,7 +44,7 @@ dummy:
|
||||||
# Eg:
|
# Eg:
|
||||||
# $ ceph-authtool --gen-print-key
|
# $ ceph-authtool --gen-print-key
|
||||||
# or
|
# or
|
||||||
# $ python2 -c "import os ; import struct ; import time; import base64 ; key = os.urandom(16) ; header = struct.pack('<hiih',1,int(time.time()),0,len(key)) ; print base64.b64encode(header + key)"
|
# $ python2 -c "import os ; import struct ; import time; import base64 ; key = os.urandom(16) ; header = struct.pack('<hiih',1,int(time.time()),0,len(key)) ; print(base64.b64encode(header + key))"
|
||||||
#
|
#
|
||||||
# To use a particular secret, you have to add 'key' to the dict below, so something like:
|
# To use a particular secret, you have to add 'key' to the dict below, so something like:
|
||||||
# - { name: client.test, key: "AQAin8tUMICVFBAALRHNrV0Z4MXupRw4v9JQ6Q==" ...
|
# - { name: client.test, key: "AQAin8tUMICVFBAALRHNrV0Z4MXupRw4v9JQ6Q==" ...
|
||||||
|
|
|
@ -406,7 +406,7 @@
|
||||||
|
|
||||||
- name: Waiting for clean PGs...
|
- name: Waiting for clean PGs...
|
||||||
shell: >
|
shell: >
|
||||||
test "[""$(ceph -s -f json | python -c 'import sys, json; print(json.load(sys.stdin)["pgmap"]["num_pgs"])')""]" = "$(ceph -s -f json | python -c 'import sys, json; print [ i["count"] for i in json.load(sys.stdin)["pgmap"]["pgs_by_state"] if i["state_name"] == "active+clean"]')"
|
test "[""$(ceph -s -f json | python -c 'import sys, json; print(json.load(sys.stdin)["pgmap"]["num_pgs"])')""]" = "$(ceph -s -f json | python -c 'import sys, json; print([ i["count"] for i in json.load(sys.stdin)["pgmap"]["pgs_by_state"] if i["state_name"] == "active+clean"])')"
|
||||||
register: result
|
register: result
|
||||||
until: result.rc == 0
|
until: result.rc == 0
|
||||||
retries: 10
|
retries: 10
|
||||||
|
|
|
@ -36,7 +36,7 @@ pools:
|
||||||
# Eg:
|
# Eg:
|
||||||
# $ ceph-authtool --gen-print-key
|
# $ ceph-authtool --gen-print-key
|
||||||
# or
|
# or
|
||||||
# $ python2 -c "import os ; import struct ; import time; import base64 ; key = os.urandom(16) ; header = struct.pack('<hiih',1,int(time.time()),0,len(key)) ; print base64.b64encode(header + key)"
|
# $ python2 -c "import os ; import struct ; import time; import base64 ; key = os.urandom(16) ; header = struct.pack('<hiih',1,int(time.time()),0,len(key)) ; print(base64.b64encode(header + key))"
|
||||||
#
|
#
|
||||||
# To use a particular secret, you have to add 'key' to the dict below, so something like:
|
# To use a particular secret, you have to add 'key' to the dict below, so something like:
|
||||||
# - { name: client.test, key: "AQAin8tUMICVFBAALRHNrV0Z4MXupRw4v9JQ6Q==" ...
|
# - { name: client.test, key: "AQAin8tUMICVFBAALRHNrV0Z4MXupRw4v9JQ6Q==" ...
|
||||||
|
|
|
@ -9,7 +9,7 @@ check_pgs() {
|
||||||
return 0
|
return 0
|
||||||
fi
|
fi
|
||||||
while [ $RETRIES -ne 0 ]; do
|
while [ $RETRIES -ne 0 ]; do
|
||||||
test "$($container_exec ceph $CEPH_CLI -s -f json | python -c 'import sys, json; print(json.load(sys.stdin)["pgmap"]["num_pgs"])')" -eq "$($container_exec ceph $CEPH_CLI -s -f json | python -c 'import sys, json; print sum ( [ i["count"] for i in json.load(sys.stdin)["pgmap"]["pgs_by_state"] if "active+clean" in i["state_name"]])')"
|
test "$($container_exec ceph $CEPH_CLI -s -f json | python -c 'import sys, json; print(json.load(sys.stdin)["pgmap"]["num_pgs"])')" -eq "$($container_exec ceph $CEPH_CLI -s -f json | python -c 'import sys, json; print(sum ( [ i["count"] for i in json.load(sys.stdin)["pgmap"]["pgs_by_state"] if "active+clean" in i["state_name"]]))')"
|
||||||
RET=$?
|
RET=$?
|
||||||
test $RET -eq 0 && return 0
|
test $RET -eq 0 && return 0
|
||||||
sleep $DELAY
|
sleep $DELAY
|
||||||
|
|
Loading…
Reference in New Issue