diff --git a/nova/files/ocata/nova-compute.conf.Debian b/nova/files/ocata/nova-compute.conf.Debian
index aa774a7..3c069ed 100644
--- a/nova/files/ocata/nova-compute.conf.Debian
+++ b/nova/files/ocata/nova-compute.conf.Debian
@@ -3132,6 +3132,18 @@
 # value means endless wait. (integer value)
 #graceful_shutdown_timeout=60
 
+#Shared storage for instances or not.
+#This option is used to distinguish different way to calculate disk usage
+#while getting hypervisor-stats.
+#ENABLE THIS ONLY WHEN ALL COMPUTE NODES ARE USING THE SAME SHARED STORAGE!
+#Otherwise stats report will be skewed.
+#Possible values:
+#* True: Average all the compute node's disk usage
+#* False: Sum all the compute node's disk usage
+# shared_storage =
+{%- if compute.shared_storage is defined %}
+shared_storage = {{ compute.shared_storage }}
+{%- endif %}
 
 [api]
 #
@@ -7153,7 +7165,6 @@
 auth_type = v3password
 project_domain_name = Default
 user_domain_name = Default
-timeout=30
 #
 # This option specifies the URL for connecting to Neutron.
 #
diff --git a/nova/files/ocata/nova-controller.conf.Debian b/nova/files/ocata/nova-controller.conf.Debian
index 33c1627..23db54e 100644
--- a/nova/files/ocata/nova-controller.conf.Debian
+++ b/nova/files/ocata/nova-controller.conf.Debian
@@ -3111,6 +3111,19 @@
 # value means endless wait. (integer value)
 #graceful_shutdown_timeout=60
 
+#Shared storage for instances or not.
+#This option is used to distinguish different way to calculate disk usage
+#while getting hypervisor-stats.
+#ENABLE THIS ONLY WHEN ALL COMPUTE NODES ARE USING THE SAME SHARED STORAGE!
+#Otherwise stats report will be skewed.
+#Possible values:
+#* True: Average all the compute node's disk usage
+#* False: Sum all the compute node's disk usage
+# shared_storage =
+{%- if controller.shared_storage is defined %}
+shared_storage = {{ controller.shared_storage }}
+{%- endif %}
+
 
 [api]
 #
diff --git a/nova/files/pike/nova-compute.conf.Debian b/nova/files/pike/nova-compute.conf.Debian
index 7781163..9988d28 100644
--- a/nova/files/pike/nova-compute.conf.Debian
+++ b/nova/files/pike/nova-compute.conf.Debian
@@ -7201,7 +7201,6 @@
 auth_type = v3password
 project_domain_name = Default
 user_domain_name = Default
-timeout=30
 #
 # This option specifies the URL for connecting to Neutron.
 #