diff --git a/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/listener/listener.help.html b/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/listener/listener.help.html
index e05dc38f..4ffe70b9 100644
--- a/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/listener/listener.help.html
+++ b/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/listener/listener.help.html
@@ -34,7 +34,7 @@
Insert Headers:
Additional headers insertion into HTTP header,
- only "X-Forwarded-For" and "X-Forwarded-Port" are supported.
+ only "X-Forwarded-For", "X-Forwarded-Port" and "X-Forwarded-Proto" are supported.
diff --git a/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/listener/listener.html b/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/listener/listener.html
index 0ee7b084..f5d2fd4d 100644
--- a/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/listener/listener.html
+++ b/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/listener/listener.html
@@ -184,7 +184,22 @@
id="x_forwarded_port"
ng-model="model.spec.listener.insert_headers['X-Forwarded-Port']">
- X-Forwarded-port
+ X-Forwarded-Port
+
+
+
+
+
+
+
diff --git a/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/model.service.spec.js b/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/model.service.spec.js
index 5071c4ed..c4a6e76d 100644
--- a/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/model.service.spec.js
+++ b/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/model.service.spec.js
@@ -37,7 +37,8 @@
sni_container_refs: ['container2'],
insert_headers: {
'X-Forwarded-For': 'True',
- 'X-Forwarded-Port': 'True'
+ 'X-Forwarded-Port': 'True',
+ 'X-Forwarded-Proto': 'True'
}
},
pool: {
@@ -2490,6 +2491,20 @@
});
});
+ describe('Model visible resources (edit listener, no x forwared proto)', function() {
+
+ beforeEach(function() {
+ delete listenerResources.listener.insert_headers['X-Forwarded-Proto'];
+ delete listenerResources.pool;
+ model.initialize('listener', '1234');
+ scope.$apply();
+ });
+
+ it('should only show listener details', function() {
+ expect(model.context.resource).toEqual('listener');
+ });
+ });
+
describe('Model visible resources (edit listener, no pool)', function() {
beforeEach(function() {
diff --git a/releasenotes/notes/add-x-forwarded-proto-e30b52a3f853ed62.yaml b/releasenotes/notes/add-x-forwarded-proto-e30b52a3f853ed62.yaml
new file mode 100644
index 00000000..84981907
--- /dev/null
+++ b/releasenotes/notes/add-x-forwarded-proto-e30b52a3f853ed62.yaml
@@ -0,0 +1,5 @@
+---
+features:
+ - |
+ Adds the ability to set the X-Forwarded-Proto insertion header on
+ listeners.