diff options
| -rw-r--r-- | ansible/roles/ceph/tasks/generate_cluster.yml | 16 | ||||
| -rw-r--r-- | docker/ceph/ceph-mon/extend_start.sh | 3 |
2 files changed, 13 insertions, 6 deletions
diff --git a/ansible/roles/ceph/tasks/generate_cluster.yml b/ansible/roles/ceph/tasks/generate_cluster.yml index 64be33ef8..06797b40f 100644 --- a/ansible/roles/ceph/tasks/generate_cluster.yml +++ b/ansible/roles/ceph/tasks/generate_cluster.yml @@ -3,21 +3,29 @@ kolla_docker: action: "start_container" common_options: "{{ docker_common_options }}" + detach: False environment: KOLLA_BOOTSTRAP: KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}" MON_IP: "{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}" image: "{{ ceph_mon_image_full }}" - name: "ceph_mon" + name: "bootstrap_ceph_mon" restart_policy: "never" volumes: - "{{ node_config_directory }}/ceph-mon/:{{ container_config_directory }}/:ro" - "ceph_mon:/var/lib/ceph" - "ceph_mon_config:/etc/ceph" -- name: Waiting for a few settings for cluster to generate keys - command: sleep 3 - changed_when: False +- name: Starting ceph-mon container + kolla_docker: + action: "start_container" + common_options: "{{ docker_common_options }}" + image: "{{ ceph_mon_image_full }}" + name: "ceph_mon" + volumes: + - "{{ node_config_directory }}/ceph-mon/:{{ container_config_directory }}/:ro" + - "ceph_mon:/var/lib/ceph" + - "ceph_mon_config:/etc/ceph" - name: Setting host for cluster files set_fact: diff --git a/docker/ceph/ceph-mon/extend_start.sh b/docker/ceph/ceph-mon/extend_start.sh index 3b8246e37..fd17de511 100644 --- a/docker/ceph/ceph-mon/extend_start.sh +++ b/docker/ceph/ceph-mon/extend_start.sh @@ -21,8 +21,7 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then ceph-authtool "${KEYRING_MON}" --import-keyring "${KEYRING_RGW}" monmaptool --create --add "$(hostname)" "${MON_IP}" --fsid "${FSID}" "${MONMAP}" - echo "Sleeping until keys are fetched" - /bin/sleep infinity + exit 0 fi # This section runs on every mon that does not have a keyring already. |