From f20730a6633a9f910a804d5205fbdbff17e622d0 Mon Sep 17 00:00:00 2001
From: Tim Rozet <trozet@redhat.com>
Date: Mon, 29 Oct 2018 16:08:04 -0400
Subject: Fixes failure to restart containers post undercloud install

It looks like the docker_container ansible module will recreate the
container if it fails to restart it. This is undesired behavior so
moving to use shell to restart the containers.

Also, fixes mistral executor container not properly mounting the
ceph-ansible playbook. Additionally fixes an issue with ceph-ansible by
downgrading the package. Related rhbz:
https://bugzilla.redhat.com/show_bug.cgi?id=1644713

Change-Id: I3199b4af11a4170d19419f70cb53f7d74def273c
Signed-off-by: Tim Rozet <trozet@redhat.com>
---
 lib/ansible/playbooks/configure_undercloud.yml | 18 ++++++------------
 lib/ansible/playbooks/deploy_overcloud.yml     |  5 +++++
 2 files changed, 11 insertions(+), 12 deletions(-)

(limited to 'lib')

diff --git a/lib/ansible/playbooks/configure_undercloud.yml b/lib/ansible/playbooks/configure_undercloud.yml
index 96080e5f..5e11ea9f 100644
--- a/lib/ansible/playbooks/configure_undercloud.yml
+++ b/lib/ansible/playbooks/configure_undercloud.yml
@@ -71,40 +71,34 @@
       become: yes
       with_items: "{{ nova_config }}"
     - name: restart nova services
-      docker_container:
-        name: "{{ item }}"
-        state: started
-        restart: yes
+      shell: "docker restart {{ item }}"
       with_items:
         - nova_conductor
         - nova_compute
         - nova_api
         - nova_scheduler
+      become: yes
     - name: openstack-configs neutron
       shell: openstack-config --set /var/lib/config-data/neutron/etc/neutron/neutron.conf DEFAULT {{ item }}
       become: yes
       with_items: "{{ neutron_config }}"
     - name: restart neutron services
-      docker_container:
-        name: "{{ item }}"
-        state: started
-        restart: yes
+      shell: "docker restart {{ item }}"
       with_items:
         - neutron_api
         - neutron_dhcp
+      become: yes
     - name: openstack-configs ironic
       shell: openstack-config --set /var/lib/config-data/ironic/etc/ironic/ironic.conf {{ item }}
       become: yes
       with_items: "{{ ironic_config }}"
     - name: restart ironic services
-      docker_container:
-        name: "{{ item }}"
-        state: started
-        restart: yes
+      shell: "docker restart {{ item }}"
       with_items:
         - ironic_api
         - ironic_conductor
         - ironic_inspector
+      become: yes
     # will need to modify the below to patch the container
     - lineinfile:
         path: /usr/lib/python2.7/site-packages/ironic/common/pxe_utils.py
diff --git a/lib/ansible/playbooks/deploy_overcloud.yml b/lib/ansible/playbooks/deploy_overcloud.yml
index 90c3ad1d..39fbf52e 100644
--- a/lib/ansible/playbooks/deploy_overcloud.yml
+++ b/lib/ansible/playbooks/deploy_overcloud.yml
@@ -80,6 +80,11 @@
         - baremetal
         - control
         - compute
+    - name: Downgrade ceph
+      yum:
+        allow_downgrade: yes
+        name: ceph-ansible-3.1.6
+      become: yes
     - name: Configure DNS server for ctlplane network
       shell: "{{ stackrc }} && openstack subnet set ctlplane-subnet {{ dns_server_args }}"
     - block:
-- 
cgit 1.2.3-korg