X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=lib%2Fansible%2Fplaybooks%2Fdeploy_overcloud.yml;h=d65fc2719b84b35711586238d49c8fb520e9903b;hb=8dc27bd1443a52c177e6dedf550fd7d24a81e84e;hp=3313bc8783331258f4cdc00110225397fe4f9bd5;hpb=2ebb431beffab428076a46101919c1ab39a3ecb0;p=apex.git

diff --git a/lib/ansible/playbooks/deploy_overcloud.yml b/lib/ansible/playbooks/deploy_overcloud.yml
index 3313bc87..d65fc271 100644
--- a/lib/ansible/playbooks/deploy_overcloud.yml
+++ b/lib/ansible/playbooks/deploy_overcloud.yml
@@ -11,35 +11,65 @@
       with_items:
         - network-environment.yaml
         - instackenv.json
-        - opnfv-environment.yaml
         - overcloud-full.qcow2
         - deploy_command
         - virtual-environment.yaml
         - baremetal-environment.yaml
+        - "{{ apex_env_file }}"
+    - name: Copy network data to undercloud
+      copy:
+        src: "{{ apex_temp_dir }}/network_data.yaml"
+        dest: "/home/stack/network_data.yaml"
+        owner: stack
+        group: stack
+        mode: 0644
+      when: os_version != 'ocata'
     - copy:
         src: "{{ apex_temp_dir }}/storage-environment.yaml"
         dest: /usr/share/openstack-tripleo-heat-templates/environments/storage-environment.yaml
         owner: root
         group: root
         mode: 0664
+    - copy:
+        src: "{{ apex_temp_dir }}/neutron-opendaylight-sriov.yaml"
+        dest: /usr/share/openstack-tripleo-heat-templates/environments/neutron-opendaylight-sriov.yaml
+        owner: root
+        group: root
+        mode: 0664
     - systemd:
         name: openstack-swift-proxy
         state: restarted
         enabled: yes
       become: yes
+    - name: Remove Ceph OSD from ceph storage role
+      lineinfile:
+        path: /usr/share/openstack-tripleo-heat-templates/roles_data.yaml
+        line: '    - OS::TripleO::Services::CephOSD'
+        owner: root
+        group: root
+        state: absent
+      become: yes
+    - name: Insert Ceph OSDs into Compute role
+      lineinfile:
+        path: /usr/share/openstack-tripleo-heat-templates/roles_data.yaml
+        insertbefore:  '^\s*-\sOS::TripleO::Services::NovaCompute$'
+        line: '    - OS::TripleO::Services::CephOSD'
+        owner: root
+        group: root
+      become: yes
     - name: Upload glance images
       shell: "{{ stackrc }} && openstack overcloud image upload"
       become: yes
       become_user: stack
     - name: Import inventory (baremetal)
-      shell: "{{ stackrc }} && {{ item }}"
-      with_items:
-        - openstack overcloud node import instackenv.json
-        - openstack overcloud node introspect --all-manageable --provide
-      when: not virtual
+      shell: "{{ stackrc }} && openstack overcloud node import instackenv.json"
+      when: introspect
+    - name: Introspect inventory (baremetal)
+      shell: "{{ stackrc }} && openstack overcloud node introspect --all-manageable --provide"
+      when: introspect
     - name: Import inventory (virtual)
       shell: "{{ stackrc }} && openstack overcloud node import --provide instackenv.json"
-      when: virtual
+      when: not introspect
     - name: Set flavors
       shell: '{{ stackrc }} && openstack flavor set --property "cpu_arch"="{{ ansible_architecture }}" {{ item }}'
       with_items:
@@ -48,8 +78,30 @@
         - compute
     - name: Configure DNS server for ctlplane network
       shell: "{{ stackrc }} && openstack subnet set ctlplane-subnet {{ dns_server_args }}"
-    - name: Execute Overcloud Deployment
-      shell: "{{ stackrc }} && bash deploy_command"
+    - 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