Add support for kubernetes deployment

[apex.git] / lib / ansible / playbooks / deploy_overcloud.yml

diff --git a/lib/ansible/playbooks/deploy_overcloud.yml b/lib/ansible/playbooks/deploy_overcloud.yml
index 18ddab4..c3094cb 100644 (file)
--- a/lib/ansible/playbooks/deploy_overcloud.yml
+++ b/lib/ansible/playbooks/deploy_overcloud.yml
@@ -15,6 +15,7 @@
         - deploy_command
         - virtual-environment.yaml
         - baremetal-environment.yaml
+        - kubernetes-environment.yaml
         - "{{ apex_env_file }}"
     - name: Copy network data to undercloud
       copy:
@@ -32,7 +33,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
@@ -41,33 +42,6 @@
         state: restarted
         enabled: yes
       become: yes
-    - name: Workaround to downgrade pacemaker (LP#1770692)
-      block:
-        - name: Pull haproxy container
-          shell: docker pull {{ undercloud_ip }}:8787/tripleo{{ os_version }}/centos-binary-haproxy:current-tripleo-rdo
-        - name: Find container pacemaker version
-          shell: docker run {{ undercloud_ip }}:8787/tripleo{{ os_version }}/centos-binary-haproxy:current-tripleo-rdo /bin/rpm -q pacemaker
-          register: pcs_version
-        - name: Create centos74 repo (contains older pacemaker)
-          copy:
-            dest: /tmp/centos74.repo
-            content: |
-              [centos74-updates]
-              name=CentOS-74 - Updates
-              baseurl=http://mirror.centos.org/centos/7.4.1708/updates/$basearch/
-              gpgcheck=1
-              gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-              enabled=1
-            mode: 0644
-        - name: Install container pacemaker version to overcloud image
-          shell: >
-            LIBGUESTFS_BACKEND=direct virt-customize -a /home/stack/overcloud-full.qcow2
-            --upload /tmp/centos74.repo:/etc/yum.repos.d/
-            --run-command "yum remove -y pacemaker-cluster-libs pacemaker-libs pacemaker pacemaker-cli"
-            --run-command "yum install -y {{ pcs_version.stdout }}" -v
-            --install "pcs"
-      become: yes
-      when: ha_enabled
     - name: Remove Ceph OSD from ceph storage role
       lineinfile:
         path: /usr/share/openstack-tripleo-heat-templates/roles_data.yaml
@@ -84,6 +58,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
@@ -108,15 +90,30 @@
     - 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
+      when: debug and vim == 'openstack'
       with_items:
         - openstack endpoint list
         - openstack service list