diff --git a/README.rst b/README.rst
index 7201452..8105aaa 100644
--- a/README.rst
+++ b/README.rst
@@ -132,6 +132,7 @@
         virtualization: kvm
         availability_zone: availability_zone_01
         security_group: true
+        resume_guests_state_on_host_boot: False
         bind:
           vnc_address: 172.20.0.100
           vnc_port: 6080
diff --git a/nova/files/liberty/nova-compute.conf.Debian b/nova/files/liberty/nova-compute.conf.Debian
index 90a3297..c8ee68e 100644
--- a/nova/files/liberty/nova-compute.conf.Debian
+++ b/nova/files/liberty/nova-compute.conf.Debian
@@ -125,8 +125,7 @@
 notification_driver = messagingv2
 {%- endif %}
 
-
-
+resume_guests_state_on_host_boot = {% compute.get('resume_guests_state_on_host_boot', False) %}
 
 {%- if compute.identity.get('version', 2) == 2 %}
 
diff --git a/nova/files/mitaka/nova-compute.conf.Debian b/nova/files/mitaka/nova-compute.conf.Debian
index c4e55fe..94af780 100644
--- a/nova/files/mitaka/nova-compute.conf.Debian
+++ b/nova/files/mitaka/nova-compute.conf.Debian
@@ -72,6 +72,8 @@
 notify_on_state_change = vm_and_task_state
 {%- endif %}
 
+resume_guests_state_on_host_boot = {% compute.get('resume_guests_state_on_host_boot', False) %}
+
 [oslo_concurrency]
 lock_path = /var/lib/nova/tmp
 
diff --git a/nova/files/newton/nova-compute.conf.Debian b/nova/files/newton/nova-compute.conf.Debian
index e349236..47bccaa 100644
--- a/nova/files/newton/nova-compute.conf.Debian
+++ b/nova/files/newton/nova-compute.conf.Debian
@@ -86,6 +86,8 @@
 notify_on_state_change = vm_and_task_state
 {%- endif %}
 
+resume_guests_state_on_host_boot = {% compute.get('resume_guests_state_on_host_boot', False) %}
+
 [oslo_concurrency]
 lock_path = /var/lib/nova/tmp
 
diff --git a/tests/pillar/compute_cluster.sls b/tests/pillar/compute_cluster.sls
index 635dcd2..bd61ecc 100644
--- a/tests/pillar/compute_cluster.sls
+++ b/tests/pillar/compute_cluster.sls
@@ -11,6 +11,7 @@
     vncproxy_url: openstack:6080
     report_interval: 60
     vnc_keymap: en-gb
+    resume_guests_state_on_host_boot: True
     bind:
       vnc_address: 127.0.0.1
       vnc_port: 6080
diff --git a/tests/pillar/compute_single.sls b/tests/pillar/compute_single.sls
index 8eb2d4c..9357d15 100644
--- a/tests/pillar/compute_single.sls
+++ b/tests/pillar/compute_single.sls
@@ -6,6 +6,7 @@
     heal_instance_info_cache_interval: 60
     vncproxy_url: openstack:6080
     vnc_keymap: en-gb
+    resume_guests_state_on_host_boot: False
     bind:
       vnc_address: 127.0.0.1
       vnc_port: 6080