diff options
| -rw-r--r-- | roles/cephadm/defaults/main.yml | 21 | ||||
| -rw-r--r-- | roles/cephadm/tasks/main.yml | 9 | ||||
| -rw-r--r-- | roles/kolla-ansible-reconfigure/tasks/main.yml | 8 |
3 files changed, 32 insertions, 6 deletions
diff --git a/roles/cephadm/defaults/main.yml b/roles/cephadm/defaults/main.yml index 5ab4c0425..9f2ae1dc9 100644 --- a/roles/cephadm/defaults/main.yml +++ b/roles/cephadm/defaults/main.yml @@ -25,6 +25,21 @@ cephadm_ceph_pools: - volumes cephadm_ceph_users: - - client.glance mon 'profile rbd' osd 'profile rbd pool=images' mgr 'profile rbd pool=images' -o /var/run/ceph/ceph.client.glance.keyring - - client.cinder mon 'profile rbd' osd 'profile rbd pool=volumes, profile rbd pool=vms, profile rbd-read-only pool=images' mgr 'profile rbd pool=volumes, profile rbd pool=vms' -o /var/run/ceph/ceph.client.cinder.keyring - - client.cinder-backup mon 'profile rbd' osd 'profile rbd pool=backups' mgr 'profile rbd pool=backups' -o /var/run/ceph/ceph.client.cinder-backup.keyring + - >- + client.glance + mon 'profile rbd' + osd 'profile rbd pool=images' + mgr 'profile rbd pool=images' + -o /var/run/ceph/ceph.client.glance.keyring + - >- + client.cinder + mon 'profile rbd' + osd 'profile rbd pool=volumes, profile rbd pool=vms, profile rbd-read-only pool=images' + mgr 'profile rbd pool=volumes, profile rbd pool=vms' + -o /var/run/ceph/ceph.client.cinder.keyring + - >- + client.cinder-backup + mon 'profile rbd' + osd 'profile rbd pool=backups' + mgr 'profile rbd pool=backups' + -o /var/run/ceph/ceph.client.cinder-backup.keyring diff --git a/roles/cephadm/tasks/main.yml b/roles/cephadm/tasks/main.yml index 7f0133779..5abf30a38 100644 --- a/roles/cephadm/tasks/main.yml +++ b/roles/cephadm/tasks/main.yml @@ -85,10 +85,17 @@ # TODO(mnasiadka): Fix merge_configs to support tabs - name: Generate ceph.conf without tabs vars: + _mon_host: >- + {%- set ns = namespace(mon_host=[]) -%} + {%- for host in groups['all'] -%} + {%- set current_mon_host = hostvars[host]['ansible_' + api_interface_name | replace('-', '_')].ipv4.address -%} + {%- set ns.mon_host = ns.mon_host + [current_mon_host] -%} + {%- endfor -%} + {{ ns.mon_host }} ceph_conf_fixed: | [global] fsid = {{ ceph_fsid }} - mon_host = {% for host in groups['all'] %} {{ hostvars[host]['ansible_' + api_interface_name | replace('-', '_')].ipv4.address }} {% if not loop.last %},{% endif %} {% endfor %} + mon_host = {{ _mon_host | join(", ") }} copy: content: "{{ ceph_conf_fixed }}" dest: "/etc/ceph/ceph.conf.fixed" diff --git a/roles/kolla-ansible-reconfigure/tasks/main.yml b/roles/kolla-ansible-reconfigure/tasks/main.yml index 76c6ffec7..a610e7a43 100644 --- a/roles/kolla-ansible-reconfigure/tasks/main.yml +++ b/roles/kolla-ansible-reconfigure/tasks/main.yml @@ -223,7 +223,9 @@ Some containers were restarted or replaced during reconfigure: {% for name in _deploy_docker_container_times %} {% if _deploy_docker_container_times[name] != _reconfigure_docker_container_times.get(name, {}) %} - - {{ name }}: {{ _deploy_docker_container_times[name].started_at }} -> {{ _reconfigure_docker_container_times.get(name, {}).get('started_at', 'MISSING') }} + - {{ name }}: + initial_start_time: {{ _deploy_docker_container_times[name].started_at }} + reconfigure_start_time: {{ _reconfigure_docker_container_times.get(name, {}).get('started_at', 'MISSING') }} {% endif %} {% endfor %} success_msg: "All containers stayed the same after reconfigure." @@ -238,7 +240,9 @@ Some containers were restarted or replaced during reconfigure: {% for name in _deploy_podman_container_times %} {% if _deploy_podman_container_times[name] != _reconfigure_podman_container_times.get(name, {}) %} - - {{ name }}: {{ _deploy_podman_container_times[name].started_at }} -> {{ _reconfigure_podman_container_times.get(name, {}).get('started_at', 'MISSING') }} + - {{ name }}: + initial_start_time: {{ _deploy_podman_container_times[name].started_at }} + reconfigure_start_time: {{ _reconfigure_podman_container_times.get(name, {}).get('started_at', 'MISSING') }} {% endif %} {% endfor %} success_msg: "All containers stayed the same after reconfigure." |