summaryrefslogtreecommitdiffstats
path: root/mcp/reclass
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-12-14 03:05:20 +0100
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-12-14 03:08:24 +0100
commit37dfddad367c8a13044a98f5f285224650bfe2de (patch)
treeb47671da38b5e9a498a4613fe4ede2a011e8c113 /mcp/reclass
parent4d4149faa5604836931c039ad1922f95a764bb76 (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/reclass')
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_init.yml2
-rw-r--r--mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_init.yml2
2 files changed, 2 insertions, 2 deletions
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