aboutsummaryrefslogtreecommitdiffstats
path: root/mcp
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-10-19 03:03:20 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-10-19 03:03:20 +0000
commit10eee9bbe2f39e94578f1017885b7bb630d0fa30 (patch)
tree6f1f8fe30800eb28eba9b7e5da4b633e4c3a3a00 /mcp
parentfd4b2e706e0403528bcb0d56e4339952eb50fcb2 (diff)
parentaa7309525627bcf5632e104d3e9b903c649b5588 (diff)
Merge "Horizon: service: Default to v2 API" into stable/euphrates
Diffstat (limited to 'mcp')
-rw-r--r--mcp/patches/0011-service.horizon.server.cluster-Default-to-v2-API.patch33
-rw-r--r--mcp/patches/patches.list1
-rwxr-xr-xmcp/scripts/salt.sh2
3 files changed, 35 insertions, 1 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
new file mode 100644
index 000000000..2f2fb7c9c
--- /dev/null
+++ b/mcp/patches/0011-service.horizon.server.cluster-Default-to-v2-API.patch
@@ -0,0 +1,33 @@
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+: 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 744304d72..accdb6b09 100644
--- a/mcp/patches/patches.list
+++ b/mcp/patches/patches.list
@@ -14,3 +14,4 @@
/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
diff --git a/mcp/scripts/salt.sh b/mcp/scripts/salt.sh
index 0a2b6bbf8..fc6b101b9 100755
--- a/mcp/scripts/salt.sh
+++ b/mcp/scripts/salt.sh
@@ -47,7 +47,6 @@ ssh ${SSH_OPTS} "${SSH_SALT}" bash -s -e << SALT_INSTALL_END
cp -r ${OPNFV_FUEL_DIR}/mcp/metadata/service /usr/share/salt-formulas/reclass
cd /srv/salt/reclass/classes/service && \
ln -sf /usr/share/salt-formulas/reclass/service/opendaylight
- cd ${OPNFV_FUEL_DIR}/mcp/patches && ./patch.sh patches.list reclass
cd /srv/salt/scripts
export DEBIAN_FRONTEND=noninteractive
@@ -59,6 +58,7 @@ ssh ${SSH_OPTS} "${SSH_SALT}" bash -s -e << SALT_INSTALL_END
cp -r ${OPNFV_FUEL_DIR}/mcp/salt-formulas/* /usr/share/salt-formulas/env
cd ${OPNFV_FUEL_DIR}/mcp/patches && ./patch.sh patches.list formulas
+ cd ${OPNFV_FUEL_DIR}/mcp/patches && ./patch.sh patches.list reclass
salt-call state.apply salt
salt '*' saltutil.sync_all