Merge "base image: Explicitly call kpartx"

[fuel.git] / mcp / reclass / classes / cluster / baremetal-mcp-ocata-odl-ha / openstack / proxy.yml

diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/proxy.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/proxy.yml
index ee5f639..9549a63 100644 (file)
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/proxy.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/proxy.yml
@@ -1,36 +1,39 @@
+##############################################################################
+# Copyright (c) 2017 Mirantis Inc., Enea AB and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+---
 classes:
-- system.linux.system.repo.mcp.openstack
-- system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
-- system.nginx.server.single
-- system.nginx.server.proxy.openstack_api
-- system.nginx.server.proxy.openstack_vnc
-- system.nginx.server.proxy.openstack_web
-- system.nginx.server.proxy.openstack.aodh
-- system.nginx.server.proxy.openstack.ceilometer
-- system.horizon.server.single
-- system.salt.minion.cert.proxy
-- system.sphinx.server.doc.reclass
-- service.keepalived.cluster.single
-- cluster.baremetal-mcp-ocata-odl-ha.infra
-- cluster.baremetal-mcp-ocata-odl-ha.openstack.dashboard
-# - cluster.baremetal-mcp-ocata-odl-ha.stacklight.proxy
+  - cluster.baremetal-mcp-ocata-common-ha.openstack_proxy
+  - cluster.baremetal-mcp-ocata-odl-ha.infra
 parameters:
-  _param:
-    keepalived_vip_interface: ens3
-    keepalived_vip_virtual_router_id: 240
-    nginx_proxy_ssl:
-      enabled: true
-      authority: ${_param:salt_minion_ca_authority}
-      engine: salt
-      mode: secure
-    cluster_vip_address: ${_param:openstack_proxy_address}
-    salt_minion_ca_host: cfg01.${_param:cluster_domain}
-  linux:
-    network:
-      interface:
-        ens2: ${_param:linux_dhcp_interface}
-        ens3: ${_param:linux_single_interface}
-    system:
-      package:
-        libapache2-mod-wsgi:
+  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
+          name: opendaylight_rest
+          check: false
+          proxy:
+            host: ${_param:opendaylight_service_host}
+            port: 8282
+            protocol: http
+          host:
+            name: ${_param:nginx_proxy_openstack_api_host}
+            port: 8282