[queens] set Neutron API retries, default to 3
available in donwstream for Queens only
Change-Id: I90e2ac80c66a900182516813898ec7f92c530c3d
Related-Issue: PROD-30592
diff --git a/metadata/service/compute/cluster.yml b/metadata/service/compute/cluster.yml
index 8934022..2f081d5 100644
--- a/metadata/service/compute/cluster.yml
+++ b/metadata/service/compute/cluster.yml
@@ -62,6 +62,7 @@
region: RegionOne
host: ${_param:opencontrail_control_address}
port: 9696
+ retry: 3
cache:
engine: memcached
# NOTE (dukov) Do not change this unless you 100% sure what you are doing
diff --git a/metadata/service/compute/ironic.yml b/metadata/service/compute/ironic.yml
index e81933b..e606370 100644
--- a/metadata/service/compute/ironic.yml
+++ b/metadata/service/compute/ironic.yml
@@ -58,6 +58,7 @@
region: RegionOne
host: ${_param:cluster_vip_address}
port: 9696
+ retry: 3
ironic:
region: RegionOne
host: ${_param:ironic_service_host}
diff --git a/metadata/service/compute/kvm.yml b/metadata/service/compute/kvm.yml
index 4174b56..0352323 100644
--- a/metadata/service/compute/kvm.yml
+++ b/metadata/service/compute/kvm.yml
@@ -59,6 +59,7 @@
region: RegionOne
host: ${_param:cluster_vip_address}
port: 9696
+ retry: 3
cache:
engine: memcached
# NOTE (dukov) Do not change this unless you 100% sure what you are doing
diff --git a/metadata/service/control/cluster.yml b/metadata/service/control/cluster.yml
index fa271ff..bb4f432 100644
--- a/metadata/service/control/cluster.yml
+++ b/metadata/service/control/cluster.yml
@@ -69,6 +69,7 @@
host: ${_param:cluster_vip_address}
port: 9696
mtu: 1500
+ retry: 3
metadata:
password: metadataPass
cache:
diff --git a/metadata/service/control/single.yml b/metadata/service/control/single.yml
index 5030462..5178b35 100644
--- a/metadata/service/control/single.yml
+++ b/metadata/service/control/single.yml
@@ -70,6 +70,7 @@
port: 9696
mtu: 1500
tenant: service
+ retry: 3
metadata:
password: ${_param:metadata_password}
cache:
diff --git a/nova/files/queens/nova-compute.conf.Debian b/nova/files/queens/nova-compute.conf.Debian
index 6f59898..b2cf195 100644
--- a/nova/files/queens/nova-compute.conf.Debian
+++ b/nova/files/queens/nova-compute.conf.Debian
@@ -7819,6 +7819,15 @@
extension_sync_interval={{ compute.network.get('extension_sync_interval', '600') }}
#
+# Integer value representing the number of retry attemps
+# if connection error happens.
+# (integer value)
+#retry = 0
+{%- if compute.network.retry is defined %}
+retry = {{ compute.network.retry }}
+{%- endif %}
+
+#
# When set to True, this option indicates that Neutron will be used to
# proxy
# metadata requests and resolve instance ids. Otherwise, the instance
diff --git a/nova/files/queens/nova-controller.conf.Debian b/nova/files/queens/nova-controller.conf.Debian
index 6d731fc..eb38886 100644
--- a/nova/files/queens/nova-controller.conf.Debian
+++ b/nova/files/queens/nova-controller.conf.Debian
@@ -7684,6 +7684,15 @@
#extension_sync_interval = 600
#
+# Integer value representing the number of retry attemps
+# if connection error happens.
+# (integer value)
+#retry = 0
+{%- if controller.network.retry is defined %}
+retry = {{ controller.network.retry }}
+{%- endif %}
+
+#
# When set to True, this option indicates that Neutron will be used to
# proxy
# metadata requests and resolve instance ids. Otherwise, the instance