[baremetal] reclass: Fix class order for common

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

diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/proxy.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/proxy.yml
index 16c4a09..07da7eb 100644 (file)
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/proxy.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/proxy.yml
@@ -1,42 +1,12 @@
+##############################################################################
+# 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.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-common.openstack_proxy
   - cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra
   - cluster.baremetal-mcp-ocata-ovs-dpdk-ha.openstack.dashboard
-# - cluster.baremetal-mcp-ocata-ovs-dpdk-ha.stacklight.proxy
-parameters:
-  _param:
-    keepalived_vip_interface: ${_param:single_nic}
-    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:
-        dhcp: ${_param:linux_dhcp_interface}
-        single: ${_param:linux_single_interface}
-    system:
-      package:
-        libapache2-mod-wsgi:
-  salt:
-    minion:
-      cert:
-        proxy:
-          alternative_names: "IP:${_param:openstack_proxy_address}"
-          key_usage: 'digitalSignature, keyEncipherment'