Fix NFS issues with Nova

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

diff --git a/lib/ansible/playbooks/post_deploy_overcloud.yml b/lib/ansible/playbooks/post_deploy_overcloud.yml
index 372aea4..f3dbfbd 100644 (file)
--- a/lib/ansible/playbooks/post_deploy_overcloud.yml
+++ b/lib/ansible/playbooks/post_deploy_overcloud.yml
@@ -13,15 +13,6 @@
         - dataplane == 'ovs_dpdk'
         - "'compute' in ansible_hostname"
         - sdn == false
-    - name: SFC config workaround
-      file:
-        src: /etc/neutron/networking_sfc.conf
-        dest: /etc/neutron/conf.d/neutron-server/networking_sfc.conf
-        state: link
-      become: yes
-      when:
-        - sfc
-        - "'controller' in ansible_hostname"
     - name: Ensure ZRPCD is running
       shell: ps aux | grep zrpcd | grep -v grep
       ignore_errors: yes
@@ -63,12 +54,10 @@
         - openstack-nova-api
         - openstack-nova-scheduler
         - openstack-nova-conductor
-    - name: Restart Compute Nova Compute (Pike Workaround)
-      shell: "systemctl restart openstack-nova-compute"
+    - name: Restart Compute Nova Compute (workaround for NFS)
+      shell: "docker restart nova_compute"
       become: yes
-      when:
-        - "'compute' in ansible_hostname"
-        - os_version == 'pike'
+      when: "'compute' in ansible_hostname or all_in_one"
     - name: Update ODL container restart policy to always
       shell: "docker update --restart=always opendaylight_api"
       become: yes
@@ -90,3 +79,17 @@
     - name: save iptables
       command: service iptables save
       become: yes
+    - name: Modify nova metadata host to be IP
+      shell: >
+        crudini --set /var/lib/config-data/puppet-generated/neutron/etc/neutron/metadata_agent.ini
+        DEFAULT nova_metadata_host $(hiera -c /etc/puppet/hiera.yaml nova_metadata_vip)
+      become: yes
+      when:
+        - "'controller' in ansible_hostname"
+        - sdn != 'ovn'
+    - name: Restart metadata service
+      shell: "docker restart neutron_metadata_agent"
+      become: yes
+      when:
+        - "'controller' in ansible_hostname"
+        - sdn != 'ovn'