]> git.apps.os.sepia.ceph.com Git - ceph-ansible.git/commitdiff
ceph-mon: Generate initial keyring
authorHa Phan <thanhha.work@gmail.com>
Thu, 21 Jun 2018 08:08:39 +0000 (16:08 +0800)
committerSébastien Han <seb@redhat.com>
Tue, 3 Jul 2018 15:38:33 +0000 (17:38 +0200)
Minor fix so that initial keyring can be generated using python3.

Signed-off-by: Ha Phan <thanhha.work@gmail.com>
(cherry picked from commit a7b7735b6fd23985d24a492f1bf4c5be7f1961b2)

roles/ceph-mon/tasks/deploy_monitors.yml

index 87096e56af4b588861cfdfe180b6b73f5ba5cd32..a9a4b324977fb08c7f53b5a450685430cb14e6f3 100644 (file)
@@ -2,7 +2,7 @@
 - name: generate monitor initial keyring
   local_action:
     module: shell
-      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)" | tee {{ fetch_directory }}/monitor_keyring.conf
+      python -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).decode())" | tee {{ fetch_directory }}/monitor_keyring.conf
     creates: "{{ fetch_directory }}/monitor_keyring.conf"
   register: monitor_keyring
   become: false