From: Michael Polenchuk <mpolenchuk@mirantis.com>
Date: Sat, 28 Apr 2018 09:40:53 +0000 (+0400)
Subject: [odl] Remove unused connecter/port from proxy
X-Git-Tag: opnfv-7.0.0~208
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F59%2F56859%2F1;p=fuel.git

[odl] Remove unused connecter/port from proxy

Change-Id: I7a880c0a011d6f5f4a7e2d8c8309871b1c290235
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
---

diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/proxy.yml b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/proxy.yml
index cd1ae9040..3c6b3a2cf 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/proxy.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/proxy.yml
@@ -14,18 +14,6 @@ parameters:
   nginx:
     server:
       site:
-        nginx_proxy_opendaylight_web:
-          enabled: true
-          type: nginx_proxy
-          name: opendaylight_web
-          check: false
-          proxy:
-            host: ${_param:opendaylight_service_host}
-            port: 8181
-            protocol: http
-          host:
-            name: ${_param:nginx_proxy_openstack_api_host}
-            port: 8181
         nginx_proxy_opendaylight_rest:
           enabled: true
           type: nginx_proxy
diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-noha/openstack/control.yml b/mcp/reclass/classes/cluster/mcp-pike-odl-noha/openstack/control.yml
index 5bc0f2444..4c48d0798 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-odl-noha/openstack/control.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-odl-noha/openstack/control.yml
@@ -14,17 +14,6 @@ parameters:
   haproxy:
     proxy:
       listen:
-        opendaylight-web:
-          type: general-service
-          service_name: opendaylight
-          binds:
-            - address: ${_param:cluster_vip_address}
-              port: 8181
-          servers:
-            - name: odl01
-              host: ${_param:opendaylight_service_host}
-              port: 8181
-              params: ${_param:haproxy_check}
         opendaylight-rest:
           type: general-service
           service_name: opendaylight