Merge "Enable neutron trunk ports" into stable/euphrates

[fuel.git] / mcp / reclass / classes / cluster / virtual-mcp-ocata-common / openstack_init.yml

diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_init.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_init.yml
index 8ac2391..81f050f 100644 (file)
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_init.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_init.yml
@@ -1,3 +1,10 @@
+##############################################################################
+# 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
+##############################################################################
 ---
 parameters:
   _param:
@@ -75,15 +82,13 @@ parameters:
     ceilometer_secret_key: opnfv_secret
     metadata_password: opnfv_secret
     horizon_version: ${_param:openstack_version}
-    # yamllint disable-line rule:line-length
     horizon_secret_key: opaesee8Que2yahJoh9fo0eefo1Aeyo6ahyei8zeiboh3aeth5loth7ieNa5xi5e
     horizon_identity_host: ${_param:cluster_vip_address}
     horizon_identity_encryption: none
-    horizon_identity_version: 3
+    horizon_identity_version: 2
     mongodb_server_replica_set: ceilometer
     mongodb_ceilometer_password: opnfv_secret
     mongodb_admin_password: opnfv_secret
-    # yamllint disable-line rule:line-length
     mongodb_shared_key: eoTh1AwahlahqueingeejooLughah4tei9feing0eeVaephooDi2li1TaeV1ooth
     aodh_version: ${_param:openstack_version}
     keystone_aodh_password: opnfv_secret