commit 765d10aa709685effbe290edd8b147d49a91103e
author mcp-jenkins <mcp-jenkins@mirantis.com> Mon Dec 03 17:21:47 2018 +0000
committer Gerrit Code Review <mail@domain.com> Mon Dec 03 17:21:47 2018 +0000
tree 9020deadc2f2c0112add0e9f3156b357d6502e75
parent 0e966ba940db9389ec90f36989ebca824f282033
parent 8a83ba0548a323bbd75de747d2d7da5289fedfb3

Merge "Add internal option [DEFAULT]shared_storage to ocata"

nova/files/ocata/nova-compute.conf.Debian

diff --git a/nova/files/ocata/nova-compute.conf.Debian b/nova/files/ocata/nova-compute.conf.Debian
index e3707a4..3c069ed 100644
--- a/nova/files/ocata/nova-compute.conf.Debian
+++ b/nova/files/ocata/nova-compute.conf.Debian
@@ -7165,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.
 #

nova/files/pike/nova-compute.conf.Debian

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.
 #