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>

diff --git a/config/deploy/common-patches.yaml b/config/deploy/common-patches.yaml
index d408a16..c217261 100644 (file)
--- a/config/deploy/common-patches.yaml
+++ b/config/deploy/common-patches.yaml
@@ -6,6 +6,8 @@ patches:
         project: openstack/tripleo-common
       - change-id: Iaa2276aadae351fbc138de258c51d786f69e4395
         project: openstack/tripleo-common
+      - change-id: I8d1db69d520da069099f919f286e6a553dd645a5
+        project: openstack/tripleo-heat-templates
     overcloud:
       - change-id: Ie988ba6a2d444a614e97c0edf5fce24b23970310
         project: openstack/puppet-tripleo
@@ -19,6 +21,8 @@ patches:
       - change-id: Iaa2276aadae351fbc138de258c51d786f69e4395
         project: openstack/tripleo-common
         branch: master
+      - change-id: I8d1db69d520da069099f919f286e6a553dd645a5
+        project: openstack/tripleo-heat-templates
     overcloud:
       - change-id: Ie988ba6a2d444a614e97c0edf5fce24b23970310
         project: openstack/puppet-tripleo

diff --git a/lib/ansible/playbooks/configure_undercloud.yml b/lib/ansible/playbooks/configure_undercloud.yml
index 96080e5..5e11ea9 100644 (file)
--- 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 90c3ad1..39fbf52 100644 (file)
--- 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: