4 files changed, 50 insertions, 9 deletions
diff --git a/lib/ansible/playbooks/configure_undercloud.yml b/lib/ansible/playbooks/configure_undercloud.yml
index fbac6eeb..f1878e81 100644
--- a/lib/ansible/playbooks/configure_undercloud.yml
+++ b/lib/ansible/playbooks/configure_undercloud.yml
@@ -47,6 +47,11 @@
     - name: openstack-configs undercloud
       shell: openstack-config --set undercloud.conf DEFAULT {{ item }}
       with_items: "{{ undercloud_config }}"
+    - name: Add ironic packages
+      yum:
+        name: openstack-ironic-api,openstack-ironic-common,
+              openstack-ironic-inspector
+      become: yes
     - name: openstack-configs ironic
       shell: openstack-config --set /etc/ironic/ironic.conf {{ item }}
       become: yes
@@ -98,6 +103,15 @@
       with_items:
         - neutron-server
         - neutron-dhcp-agent
+    - name: Configure workaround for mariadb long blob (LP#1768913)
+      shell: openstack-config --set /etc/my.cnf.d/galera.cnf mysqld innodb_log_file_size 256M
+      become: yes
+    - name: restart mariadb service
+      service:
+        name: mariadb
+        state: restarted
+        enabled: yes
+      become: yes
     - name: configure external network vlan ifcfg
       template:
         src: external_vlan_ifcfg.yml.j2
@@ -174,7 +188,7 @@
       become: yes
       when:
         - not nat_network_ipv6
-        - virtual_overcloud
+        - nat
     - name: fetch storage environment file
       fetch:
         src: /usr/share/openstack-tripleo-heat-templates/environments/storage-environment.yaml
@@ -182,7 +196,7 @@
         flat: yes
     - name: fetch sriov environment file
       fetch:
-        src: /usr/share/openstack-tripleo-heat-templates/environments/neutron-opendaylight-sriov.yaml
+        src: /usr/share/openstack-tripleo-heat-templates/environments/services/neutron-opendaylight-sriov.yaml
         dest: "{{ apex_temp_dir }}/"
         flat: yes
 
diff --git a/lib/ansible/playbooks/deploy_overcloud.yml b/lib/ansible/playbooks/deploy_overcloud.yml
index 268a5173..0039256d 100644
--- a/lib/ansible/playbooks/deploy_overcloud.yml
+++ b/lib/ansible/playbooks/deploy_overcloud.yml
@@ -32,7 +32,7 @@
         mode: 0664
     - copy:
         src: "{{ apex_temp_dir }}/neutron-opendaylight-sriov.yaml"
-        dest: /usr/share/openstack-tripleo-heat-templates/environments/neutron-opendaylight-sriov.yaml
+        dest: /usr/share/openstack-tripleo-heat-templates/environments/services/neutron-opendaylight-sriov.yaml
         owner: root
         group: root
         mode: 0664
@@ -57,6 +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,9 +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
+      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
diff --git a/lib/ansible/playbooks/post_deploy_overcloud.yml b/lib/ansible/playbooks/post_deploy_overcloud.yml
index 13623f26..af743b29 100644
--- a/lib/ansible/playbooks/post_deploy_overcloud.yml
+++ b/lib/ansible/playbooks/post_deploy_overcloud.yml
@@ -51,6 +51,7 @@
         owner: root
         group: tacker
       become: yes
+      when: tacker
     - name: Restart Controller Neutron/Nova Services (Pike Workaround)
       shell: "systemctl restart {{ item }}"
       become: yes
diff --git a/lib/ansible/playbooks/prepare_overcloud_containers.yml b/lib/ansible/playbooks/prepare_overcloud_containers.yml
index 88a8df1c..79629c2b 100644
--- a/lib/ansible/playbooks/prepare_overcloud_containers.yml
+++ b/lib/ansible/playbooks/prepare_overcloud_containers.yml
@@ -21,7 +21,7 @@
     - name: Prepare generic docker registry image file
       shell: >
         {{ stackrc }} && openstack overcloud container image prepare
-        --namespace trunk.registry.rdoproject.org/{{ os_version }}
+        --namespace docker.io/tripleo{{ os_version }}
         --tag {{ container_tag }}
         --push-destination {{ undercloud_ip }}:8787
         -e /usr/share/openstack-tripleo-heat-templates/environments/docker.yaml
@@ -31,7 +31,7 @@
     - name: Prepare SDN docker registry image file
       shell: >
         {{ stackrc }} && openstack overcloud container image prepare
-        --namespace trunk.registry.rdoproject.org/{{ os_version }}
+        --namespace docker.io/tripleo{{ os_version }}
         --tag {{ container_tag }}
         --push-destination {{ undercloud_ip }}:8787
         -e {{ sdn_env_file }}
@@ -56,13 +56,13 @@
     - name: Patch Docker images
       shell: >
         cd /home/stack/containers/{{ item }} && docker build
-        -t {{ undercloud_ip }}:8787/{{ os_version }}/centos-binary-{{ item }}:apex .
+        -t {{ undercloud_ip }}:8787/tripleo{{ os_version }}/centos-binary-{{ item }}:apex .
       when:
         - patched_docker_services|length > 0
         - item in (response.json)['repositories']|join(" ")
       with_items: "{{ patched_docker_services }}"
     - name: Push patched docker images to local registry
-      shell: docker push {{ undercloud_ip }}:8787/{{ os_version }}/centos-binary-{{ item }}:apex
+      shell: docker push {{ undercloud_ip }}:8787/tripleo{{ os_version }}/centos-binary-{{ item }}:apex
       when:
         - patched_docker_services|length > 0
         - item in (response.json)['repositories']|join(" ")
@@ -70,7 +70,7 @@
     - name: Prepare deployment generic docker image file
       shell: >
         {{ stackrc }} && openstack overcloud container image prepare
-        --namespace {{ undercloud_ip }}:8787/{{ os_version }}
+        --namespace {{ undercloud_ip }}:8787/tripleo{{ os_version }}
         --tag {{ container_tag }}
         -e /usr/share/openstack-tripleo-heat-templates/environments/docker.yaml
         --output-env-file docker-images.yaml
@@ -79,7 +79,7 @@
     - name: Prepare deployment SDN docker image file
       shell: >
         {{ stackrc }} && openstack overcloud container image prepare
-        --namespace {{ undercloud_ip }}:8787/{{ os_version }}
+        --namespace {{ undercloud_ip }}:8787/tripleo{{ os_version }}
         --tag {{ container_tag }}
         -e {{ sdn_env_file }}
         --output-env-file sdn-images.yaml