Merge "Disable cinder api apache config in distro install" into stabl…

…e/rocky
openstack · Dec 11, 2018 · a824d8d · a824d8d
2 parents 030572d + ab866a4
commit a824d8d
Showing 1 changed file with 16 additions and 0 deletions.
diff --git a/tasks/cinder_post_install.yml b/tasks/cinder_post_install.yml
@@ -72,3 +72,19 @@
     mode: "0440"
     owner: "root"
     group: "root"
+
+- name: Disable cinder-wsgi apache2 configuration
+  command: a2disconf cinder-wsgi
+  args:
+    removes: "/etc/apache2/conf-enabled/cinder-wsgi.conf"
+  when:
+    - cinder_install_method == 'distro'
+    - ansible_pkg_mgr == 'apt'
+    - "cinder_services['cinder-api']['group'] in group_names"
+  register: cinder_wsgi_conf_disable
+
+- name: Reload apache2
+  service:
+    name: apache2
+    state: reloaded
+  when: cinder_wsgi_conf_disable is changed