From a72cc42077b96223ad6e776a4cd0f03a3c41bd29 Mon Sep 17 00:00:00 2001
From: Manuel Buil <mbuil@suse.com>
Date: Wed, 8 Nov 2017 13:20:51 +0100
Subject: [WIP] Adapt XCI scenarios for Fraser

We plan to support both stable/pike and master in the Fraser release

Change-Id: I5acd5d796a4ed376d5110d7268980faec9cec126
Signed-off-by: Manuel Buil <mbuil@suse.com>
---
 .../files/tacker_files/haproxy_config.yml          | 39 +++++++++++++++-------
 1 file changed, 27 insertions(+), 12 deletions(-)

(limited to 'scenarios/os-odl-sfc/role/os-odl-sfc/files/tacker_files/haproxy_config.yml')

diff --git a/scenarios/os-odl-sfc/role/os-odl-sfc/files/tacker_files/haproxy_config.yml b/scenarios/os-odl-sfc/role/os-odl-sfc/files/tacker_files/haproxy_config.yml
index 386a63e3..49b58360 100644
--- a/scenarios/os-odl-sfc/role/os-odl-sfc/files/tacker_files/haproxy_config.yml
+++ b/scenarios/os-odl-sfc/role/os-odl-sfc/files/tacker_files/haproxy_config.yml
@@ -1,3 +1,17 @@
+# Copyright 2014, Rackspace US, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 haproxy_default_services:
   - service:
       haproxy_service_name: galera
@@ -111,7 +125,7 @@ haproxy_default_services:
       haproxy_ssl: "{{ haproxy_ssl }}"
       haproxy_balance_type: http
       haproxy_backend_options:
-        - "httpchk HEAD /"
+        - "httpchk GET /"
   - service:
       haproxy_service_name: nova_api_metadata
       haproxy_backend_nodes: "{{ groups['nova_api_metadata'] | default([]) }}"
@@ -137,6 +151,8 @@ haproxy_default_services:
       haproxy_balance_type: http
       haproxy_backend_options:
         - "httpchk HEAD /"
+      haproxy_backend_httpcheck_options:
+        - "expect status 401"
   - service:
       haproxy_service_name: nova_console
       haproxy_backend_nodes: "{{ groups['nova_console'] | default([]) }}"
@@ -188,14 +204,6 @@ haproxy_default_services:
       haproxy_balance_type: http
       haproxy_backend_options:
         - "httpchk /healthcheck"
-  - service:
-      haproxy_service_name: ceilometer_api
-      haproxy_backend_nodes: "{{ groups['ceilometer_api_container'] | default([]) }}"
-      haproxy_ssl: "{{ haproxy_ssl }}"
-      haproxy_port: 8777
-      haproxy_balance_type: tcp
-      haproxy_backend_options:
-        - tcp-check
   - service:
       haproxy_service_name: aodh_api
       haproxy_backend_nodes: "{{ groups['aodh_api'] | default([]) }}"
@@ -246,9 +254,7 @@ haproxy_default_services:
       haproxy_port: 9311
       haproxy_balance_type: http
       haproxy_backend_options:
-        - "httpchk HEAD /"
-      haproxy_backend_httpcheck_options:
-        - "expect status 401"
+        - "httpchk GET /"
   - service:
       haproxy_service_name: designate_api
       haproxy_backend_nodes: "{{ groups['designate_api'] | default([]) }}"
@@ -259,6 +265,15 @@ haproxy_default_services:
         - "forwardfor"
         - "httpchk /versions"
         - "httplog"
+  - service:
+      haproxy_service_name: octavia
+      haproxy_backend_nodes: "{{ groups['octavia_all'] | default([]) }}"
+      haproxy_ssl: "{{ haproxy_ssl }}"
+      haproxy_port: 9876
+      haproxy_balance_type: http
+      haproxy_backend_options:
+        - "httpchk GET /"
+      haproxy_whitelist_networks: "{{ haproxy_octavia_whitelist_networks }}"
   - service:
       haproxy_service_name: tacker
       haproxy_backend_nodes: "{{ groups['tacker_all'] | default([]) }}"
-- 
cgit 1.2.3-korg