Merge "Added possibility to manage use_db_reconnect option for Nova"
diff --git a/nova/controller.sls b/nova/controller.sls
index a25c1d6..cf342ae 100644
--- a/nova/controller.sls
+++ b/nova/controller.sls
@@ -34,6 +34,34 @@
pkg.installed:
- names: {{ controller.pkgs }}
+nova_spicehtml5proxy_service_disable:
+ service.disabled:
+ - name: nova-spicehtml5proxy
+ - require:
+ - pkg: nova_controller_packages
+
+nova_spicehtml5proxy_service_reset_failed:
+ cmd.run:
+ - name: systemctl reset-failed nova-spicehtml5proxy
+ - onlyif:
+ - systemctl list-units --state=failed | grep nova-spicehtml5proxy
+ - require:
+ - pkg: nova_controller_packages
+
+nova_xenvncproxy_service_disable:
+ service.disabled:
+ - name: nova-xenvncproxy
+ - require:
+ - pkg: nova_controller_packages
+
+nova_xenvncproxy_service_reset_failed:
+ cmd.run:
+ - name: systemctl reset-failed nova-xenvncproxy
+ - onlyif:
+ - systemctl list-units --state=failed | grep nova-xenvncproxy
+ - require:
+ - pkg: nova_controller_packages
+
{%- if not salt['user.info']('nova') %}
user_nova:
user.present: