diff options
author | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-12-14 03:05:20 +0100 |
---|---|---|
committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-12-14 03:08:24 +0100 |
commit | 37dfddad367c8a13044a98f5f285224650bfe2de (patch) | |
tree | b47671da38b5e9a498a4613fe4ede2a011e8c113 /mcp/patches/0011-service.horizon.server.cluster-Default-to-v2-API.patch | |
parent | 4d4149faa5604836931c039ad1922f95a764bb76 (diff) |
Revert "Horizon: service: Default to v2 API"
Pike Horizon packages contain the fix for full v3 compatibility.
Also update the reclass models to use v3 API.
JIRA: FUEL-284
This reverts commit 68ff467c4c2d9d0f201e2912c97616402f8109a3.
Change-Id: I7795197100a67f892889eefce73252ec90d289cc
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'mcp/patches/0011-service.horizon.server.cluster-Default-to-v2-API.patch')
-rw-r--r-- | mcp/patches/0011-service.horizon.server.cluster-Default-to-v2-API.patch | 33 |
1 files changed, 0 insertions, 33 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: |