FIX: ceph Deployment failed: RuntimeError: bootstrap-osd keyring not found

JIRA: COMPASS-85
  - try to gather keys manually before next operation

Change-Id: I32a7e79488813c42b5ead0f08675cf346c81eb54
Signed-off-by: graiss <grakiss.wanglei@huawei.com>

diff --git a/build/build.conf b/build/build.conf
index d57e5f3..c6f0bde 100644 (file)
--- a/build/build.conf
+++ b/build/build.conf
@@ -1,5 +1,5 @@
 TIMEOUT=10
-export PACKAGE_URL=${PACKAGE_URL:-http://58.251.166.184:9999}
+export PACKAGE_URL=${PACKAGE_URL:-http://205.177.226.235:9999}
 
 #begin: package download
 export CENTOS_BASE=${CENTOS_BASE:-$PACKAGE_URL/centos_base.iso}

diff --git a/deploy/adapters/ansible/roles/ceph-deploy/tasks/ceph_install_Debian.yml b/deploy/adapters/ansible/roles/ceph-deploy/tasks/ceph_install_Debian.yml
index f897c94..06c28f2 100644 (file)
--- a/deploy/adapters/ansible/roles/ceph-deploy/tasks/ceph_install_Debian.yml
+++ b/deploy/adapters/ansible/roles/ceph-deploy/tasks/ceph_install_Debian.yml
@@ -10,6 +10,10 @@
 - name: create monitor node in controller group
   shell: cd {{ ceph_cluster_dir[0] }} && ceph-deploy --overwrite-conf mon create-initial
 
+- name: gather keys
+  shell: cd {{ ceph_cluster_dir[0] }} && ceph-deploy gatherkeys {{ ceph_cluster_hosts.stdout_lines[0] }}
+  ignore_errors: True
+
 - name: copy create_osd.sh to host1
   copy: src=create_osd.sh dest=~/create_osd.sh mode=0777
   tags:

diff --git a/deploy/adapters/ansible/roles/ceph-deploy/tasks/ceph_install_RedHat.yml b/deploy/adapters/ansible/roles/ceph-deploy/tasks/ceph_install_RedHat.yml
index ed88cd5..6ce01b8 100644 (file)
--- a/deploy/adapters/ansible/roles/ceph-deploy/tasks/ceph_install_RedHat.yml
+++ b/deploy/adapters/ansible/roles/ceph-deploy/tasks/ceph_install_RedHat.yml
@@ -10,6 +10,10 @@
 - name: create monitor node in controller group
   shell: cd {{ ceph_cluster_dir[0] }} && ceph-deploy --overwrite-conf mon create-initial
 
+- name: gather keys
+  shell: cd {{ ceph_cluster_dir[0] }} && ceph-deploy gatherkeys {{ ceph_cluster_hosts.stdout_lines[0] }}
+  ignore_errors: True
+
 - name: copy create_osd.sh to host1
   copy: src=create_osd.sh dest=~/create_osd.sh mode=0777
   tags:

diff --git a/deploy/adapters/ansible/roles/cinder-volume/tasks/main.yml b/deploy/adapters/ansible/roles/cinder-volume/tasks/main.yml
index a258a0c..6b193d6 100644 (file)
--- a/deploy/adapters/ansible/roles/cinder-volume/tasks/main.yml
+++ b/deploy/adapters/ansible/roles/cinder-volume/tasks/main.yml
@@ -15,11 +15,11 @@
 
 - name: load loop.yml
   include: loop.yml
-  when: status.stat.isblk == False
+  when: status.stat.exists == False or status.stat.isblk == False 
 
 - name: load real.yml
   include: real.yml
-  when: status.stat.isblk == True
+  when: status.stat.exists == True and status.stat.isblk == True
 
 - name: upload cinder-volume configuration
   template: src=cinder.conf dest=/etc/cinder/cinder.conf