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>

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 (file)
index 2f2fb7c..0000000
--- 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 00b1145..4214b63 100644 (file)
--- 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 e2f6539..fe4be9d 100644 (file)
--- 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 cf35a2b..89b06fb 100644 (file)
--- 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