Merge "Fixes Ceph PG calculation"

diff --combined lib/ansible/playbooks/deploy_overcloud.yml
index d65fc27,53dc699..a9c3b98
--- 1/lib/ansible/playbooks/deploy_overcloud.yml
--- 2/lib/ansible/playbooks/deploy_overcloud.yml
+++ b/lib/ansible/playbooks/deploy_overcloud.yml
@@@ -57,6 -57,14 +57,14 @@@
          owner: root
          group: root
        become: yes
+     - name: Insert Ceph OSDs into Controller role
+       lineinfile:
+         path: /usr/share/openstack-tripleo-heat-templates/roles_data.yaml
+         insertbefore:  '^\s*-\sOS::TripleO::Services::CephRbdMirror$'
+         line: '    - OS::TripleO::Services::CephOSD'
+         owner: root
+         group: root
+       become: yes
      - name: Upload glance images
        shell: "{{ stackrc }} && openstack overcloud image upload"
        become: yes
@@@ -81,27 -89,12 +89,27 @@@
      - block:
          - name: Execute Overcloud Deployment
            shell: "{{ stackrc }} && bash deploy_command"
 -
 +          become: yes
 +          become_user: stack
        rescue:
          - name: Show overcloud failures
            shell: "{{ stackrc }} && openstack stack failures list overcloud --long"
 -      become: yes
 -      become_user: stack
 +          become: yes
 +          become_user: stack
 +      always:
 +        - name: Archive Mistral logs
 +          archive:
 +            path:
 +             - /var/lib/mistral
 +             - /var/log/mistral
 +            dest: /root/mistral_logs.tar.gz
 +          become: yes
 +        - name: Fetch mistral logs
 +          fetch:
 +            src: /root/mistral_logs.tar.gz
 +            dest: "{{ apex_temp_dir }}/"
 +            flat: yes
 +          become: yes
      - name: Show Keystone output
        shell: "{{ overcloudrc }} && {{ item }}"
        when: debug