commit 50a9b8e38968a2d11557057a6033d9a3004092f2
author mcp-jenkins <mcp-jenkins@mirantis.com> Mon Jan 28 14:09:59 2019 +0000
committer Gerrit Code Review <mail@domain.com> Mon Jan 28 14:09:59 2019 +0000
tree 833870ad530b12493d3f9c4f8c8e1e54125946f1
parent 527531c4af122f8fd5604e0b767dc60265b53c03
parent 6a26e28ff15913b2974cd72aee41080220cc7a68

Merge "Add apache proxy site for octavia"

apache/server/proxy/openstack/octavia.yml

diff --git a/apache/server/proxy/openstack/octavia.yml b/apache/server/proxy/openstack/octavia.yml
new file mode 100644
index 0000000..6b95a83
--- /dev/null
+++ b/apache/server/proxy/openstack/octavia.yml
@@ -0,0 +1,26 @@
+parameters:
+  _param:
+    apache_ssl:
+      enabled: false
+    apache_proxy_ssl: ${_param:apache_ssl}
+    apache_proxy_openstack_api_host: ${_param:cluster_public_host}
+    apache_proxy_openstack_api_address: 0.0.0.0
+    apache_proxy_openstack_octavia_host: ${_param:octavia_service_host}
+  apache:
+    server:
+      site:
+        apache_proxy_openstack_api_octavia:
+          enabled: true
+          type: proxy
+          name: openstack_api_octavia
+          check: false
+          proxy:
+            host: ${_param:apache_proxy_openstack_octavia_host}
+            port: 9876
+            protocol: http
+            retry: ${_param:apache_proxy_openstack_octavia_retry}
+          host:
+            name: ${_param:apache_proxy_openstack_api_host}
+            port: 9876
+            address: ${_param:apache_proxy_openstack_api_address}
+          ssl: ${_param:apache_proxy_ssl}

defaults/openstack/init.yml

diff --git a/defaults/openstack/init.yml b/defaults/openstack/init.yml
index 1e02297..5adb1a7 100644
--- a/defaults/openstack/init.yml
+++ b/defaults/openstack/init.yml
@@ -123,6 +123,7 @@
     apache_proxy_openstack_neutron_retry: ${_param:apache_proxy_openstack_api_retry}
     apache_proxy_openstack_aodh_retry: ${_param:apache_proxy_openstack_api_retry}
     apache_proxy_openstack_placement_retry: ${_param:apache_proxy_openstack_api_retry}
+    apache_proxy_openstack_octavia_retry: ${_param:apache_proxy_openstack_api_retry}
     # Horizon
     # 'direct' mode will require cors on glance side to be enabled.
     horizon_images_upload_mode: 'direct'