Parametrized network config: nic device names

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

diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/proxy.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/proxy.yml
index 5e9a2c5..c6a68fa 100644 (file)
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/proxy.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/proxy.yml
@@ -1,23 +1,23 @@
+---
 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-ovs-ha.infra
-- cluster.baremetal-mcp-ocata-ovs-ha.openstack.dashboard
-# - cluster.baremetal-mcp-ocata-ovs-ha.stacklight.proxy
+  - 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-ovs-ha.infra
+  - cluster.baremetal-mcp-ocata-ovs-ha.openstack.dashboard
+  # - cluster.baremetal-mcp-ocata-ovs-ha.stacklight.proxy
 parameters:
   _param:
-    keepalived_vip_interface: ens3
+    keepalived_vip_interface: ${_param:single_nic}
     keepalived_vip_virtual_router_id: 240
     nginx_proxy_ssl:
       enabled: true
@@ -29,8 +29,8 @@ parameters:
   linux:
     network:
       interface:
-        ens2: ${_param:linux_dhcp_interface}
-        ens3: ${_param:linux_single_interface}
+        dhcp: ${_param:linux_dhcp_interface}
+        single: ${_param:linux_single_interface}
     system:
       package:
         libapache2-mod-wsgi: