Merge "Change url_timeout in nova.conf" into 7.0

deployment_scripts/puppet/manifests/nova-neutron-timeout-fix.pp

@@ -0,0 +1,9 @@
+notice('fuel-plugin-nsxv: nova-neutron-timeout-fix.pp')
+
+$neutron_url_timeout = '600'
+# NOT enabled by default
+$use_neutron         = hiera('use_neutron', false)
+
+if ($use_neutron) {
+  nova_config { 'neutron/url_timeout': value => $neutron_url_timeout }
+}

deployment_scripts/puppet/modules/nsxv/manifests/compute_vmware_nova_config.pp

@@ -1,4 +1,5 @@
 class nsxv::compute_vmware_nova_config (
+  $neutron_url_timeout = '600',
 ) {
   include ::nova::params
 
@@ -27,6 +28,7 @@ class nsxv::compute_vmware_nova_config (
     neutron_admin_auth_url    => $neutron_admin_auth_url,
     neutron_url               => $neutron_url,
     neutron_ovs_bridge        => '',
+    neutron_url_timeout       => $neutron_url_timeout,
   }
 
   create_resources(nova_config, $nova_parameters)

deployment_tasks.yaml

@@ -63,3 +63,12 @@
     puppet_manifest: puppet/manifests/openstack-haproxy-neutron.pp
     puppet_modules: puppet/modules:/etc/puppet/modules
     timeout: 300
+- id: nova-neutron-timeout-fix
+  type: puppet
+  groups: [primary-controller, controller]
+  required_for: [vmware-vcenter]
+  requires: [openstack-controller]
+  parameters:
+    puppet_manifest: puppet/manifests/nova-neutron-timeout-fix.pp
+    puppet_modules: puppet/modules:/etc/puppet/modules
+    timeout: 300