Merge "Add ability to set novajoin_read|connect timeout"

roles/undercloud-deploy/README.md

@@ -40,6 +40,8 @@ http://docs.openstack.org/developer/tripleo-quickstart/accessing-libvirt.html
 - `undercloud_enable_novajoin`: Sets up the 'enable_novajoin' value from
   undercloud.conf. Note that using 'enable_tls_everywhere' will have the same
   effect. Defaults to false.
+- `novajoin_connect_timeout`: <5> Sets vendordata_dynamic_connect_timeout when novajoin is enabled
+- `novajoin_read_timeout:` <5> Sets vendordata_dynamic_read_timeout when novajoin is enabled
 - `prepare_novajoin`: If set to true, it will install novajoin in the undercloud,
   and run a script that will create the required privileges/permissions in
   FreeIPA, as well as the undercloud host entry. this requires

roles/undercloud-deploy/defaults/main.yml

@@ -27,4 +27,8 @@ undercloud_enable_novajoin: false
 prepare_novajoin: true
 
 # location which the novajoin-ipa-setup will store the FreeIPA token
-freeipa_otp_key: /tmp/ipa-otp.txt
+freeipa_otp_key: /tmp/ipa-otp.txt
+
+# determines vendordata_dynamic_connect|read_timeout when novajoin is enabled
+novajoin_connect_timeout: 5
+novajoin_read_timeout: 5

roles/undercloud-deploy/templates/quickstart-hieradata-overrides.yaml.j2

@@ -63,6 +63,11 @@ nova::api::osapi_compute_workers: "%{hiera('undercloud_workers')}"
 nova::conductor::workers: "%{hiera('undercloud_workers')}"
 {% endif %}
 
+{% if undercloud_enable_novajoin or enable_tls_everywhere %}
+nova::api::vendordata_dynamic_connect_timeout: {{ novajoin_connect_timeout }}
+nova::api::vendordata_dynamic_read_timeout: {{ novajoin_read_timeout }}
+{% endif %}
+
 {% if undercloud_swift_workers is defined %}
 swift::proxy::workers: {{undercloud_swift_workers}}
 {% elif undercloud_workers is defined %}