pod_config: cleanup: Drop infra_compute_*_address

[fuel.git] / mcp / reclass / classes / cluster / baremetal-mcp-ocata-common / openstack_control.yml

diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_control.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_control.yml
index df21a78..ce82807 100644 (file)
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_control.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_control.yml
@@ -1,7 +1,15 @@
+##############################################################################
+# 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.glusterfs
   - system.ceilometer.client
   - system.memcached.server.single
   - system.keystone.server.cluster
@@ -32,11 +40,17 @@ parameters:
     cluster_node03_hostname: ctl03
     cluster_node03_address: ${_param:openstack_control_node03_address}
     nova_vncproxy_url: https://${_param:cluster_public_host}:6080
+    glusterfs_version: '3.10'
+    dhcp_nic: ${_param:opnfv_vcp_vm_primary_interface}
+    single_nic: ${_param:opnfv_vcp_vm_secondary_interface}
   linux:
     network:
       interface:
         dhcp: ${_param:linux_dhcp_interface}
         single: ${_param:linux_single_interface}
+  neutron:
+    server:
+      vlan_aware_vms: true
   keystone:
     server:
       cacert: /etc/ssl/certs/mcp_os_cacert