diff options
Diffstat (limited to 'mcp')
4 files changed, 2 insertions, 36 deletions
diff --git a/mcp/patches/0011-service.horizon.server.cluster-Default-to-v2-API.patch b/mcp/patches/0011-service.horizon.server.cluster-Default-to-v2-API.patch deleted file mode 100644 index 2f2fb7c9c..000000000 --- a/mcp/patches/0011-service.horizon.server.cluster-Default-to-v2-API.patch +++ /dev/null @@ -1,33 +0,0 @@ -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -: 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 -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -From: Alexandru Avadanii <Alexandru.Avadanii@enea.com> -Date: Thu, 19 Oct 2017 02:03:01 +0200 -Subject: [PATCH] service.horizon.server.cluster: Default to v2 API - -Horizon service definition hardcodes the API version to v3, and -also overrides the value in our reclass model during interpolation. -Adjust the default to '2'. - -Signed-off-by: Ting Wu <ting.wu@enea.com> -Signed-off-by: Junaid Ali <junaidali.yahya@gmail.com> -Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> ---- - -diff --git a/service/horizon/server/cluster.yml b/service/horizon/server/cluster.yml ---- a/service/horizon/server/cluster.yml -+++ b/service/horizon/server/cluster.yml -@@ -6,7 +6,7 @@ - _param: - horizon_version: liberty - horizon_identity_host: localhost -- horizon_identity_version: 3 -+ horizon_identity_version: 2 - horizon_identity_encryption: none - horizon_identity_endpoint_type: internalURL - horizon: diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list index 00b1145d8..4214b63a7 100644 --- a/mcp/patches/patches.list +++ b/mcp/patches/patches.list @@ -14,6 +14,5 @@ /usr/share/salt-formulas/env: 0008-Handle-file_recv-option.patch /usr/share/salt-formulas/env: 0009-seedng-module-Sync-salt-version.patch /usr/share/salt-formulas/env: 0010-maas-region-allow-timeout-override.patch -/usr/share/salt-formulas/reclass: 0011-service.horizon.server.cluster-Default-to-v2-API.patch /usr/share/salt-formulas/env: 0012-linux.storage.lvm-Disable-filter.patch /usr/share/salt-formulas/env: 0013-libvirt-unix_sock_group-s-libvirtd-libvirt.patch diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_init.yml index e2f6539c4..fe4be9d60 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_init.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_init.yml @@ -149,7 +149,7 @@ parameters: horizon_secret_key: opaesee8Que2yahJoh9fo0eefo1Aeyo6ahyei8zeiboh3aeth5loth7ieNa5xi5e horizon_identity_host: ${_param:openstack_control_address} horizon_identity_encryption: none - horizon_identity_version: 2 + horizon_identity_version: 3 mongodb_server_replica_set: ceilometer mongodb_ceilometer_password: opnfv_secret mongodb_admin_password: opnfv_secret diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_init.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_init.yml index cf35a2b20..89b06fb7e 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_init.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_init.yml @@ -85,7 +85,7 @@ parameters: horizon_secret_key: opaesee8Que2yahJoh9fo0eefo1Aeyo6ahyei8zeiboh3aeth5loth7ieNa5xi5e horizon_identity_host: ${_param:cluster_vip_address} horizon_identity_encryption: none - horizon_identity_version: 2 + horizon_identity_version: 3 mongodb_server_replica_set: ceilometer mongodb_ceilometer_password: opnfv_secret mongodb_admin_password: opnfv_secret |