X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=lib%2Fansible%2Fplaybooks%2Fdeploy_overcloud.yml;h=aa3d80676dfccd36f09bb6436a9627e64c69d129;hb=67e7b3c76402445d7e62d5953d661794ec1f7c6d;hp=76bbbc67ec122ea68625cf2dcfbe6d5a3a54ca65;hpb=f4d388ea508ba00771e43a219ac64e0d430b73bd;p=apex.git

diff --git a/lib/ansible/playbooks/deploy_overcloud.yml b/lib/ansible/playbooks/deploy_overcloud.yml
index 76bbbc67..aa3d8067 100644
--- a/lib/ansible/playbooks/deploy_overcloud.yml
+++ b/lib/ansible/playbooks/deploy_overcloud.yml
@@ -11,11 +11,19 @@
       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
@@ -27,29 +35,49 @@
         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"="x86_64" {{ item }}'
+      shell: '{{ stackrc }} && openstack flavor set --property "cpu_arch"="{{ ansible_architecture }}" {{ item }}'
       with_items:
         - baremetal
         - control
         - 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"
+      rescue:
+        - name: Show overcloud failures
+          shell: "{{ stackrc }} && openstack stack failures list overcloud --long"
     - name: Show Keystone output
       shell: "{{ overcloudrc }} && {{ item }}"
       when: debug