Merge "Update Nova configs with correct timeout setting" into 3.1

2017-01-25 17:34:06 +00:00
parent a10e4d3e35 794dbaf1f3
commit 591233f15d
5 changed files with 34 additions and 6 deletions
--- a/deployment_scripts/puppet/modules/contrail/manifests/compute/nova.pp
+++ b/deployment_scripts/puppet/modules/contrail/manifests/compute/nova.pp
@@ -69,9 +69,7 @@ class contrail::compute::nova {
    }
  }

-  nova_config {
-    'DEFAULT/neutron_url_timeout': value => '300';
-  }
+  nova_config {'neutron/timeout' : value => '300' }

  # [LCM] Workaroud to fix duplicate declaration with nova_config recource
  # from class 'nova::compute' during catalog compilation.