summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--docs/release/release-notes/release-notes.rst2
-rw-r--r--docs/release/scenarios/os-nosdn-ovs-ha/index.rst16
-rw-r--r--docs/release/scenarios/os-nosdn-ovs-ha/os-nosdn-ovs-ha.rst42
-rw-r--r--docs/release/scenarios/os-nosdn-ovs-noha/index.rst16
-rw-r--r--docs/release/scenarios/os-nosdn-ovs-noha/os-nosdn-ovs-noha.rst41
-rw-r--r--mcp/patches/0011-service.horizon.server.cluster-Default-to-v2-API.patch33
-rw-r--r--mcp/patches/patches.list1
-rw-r--r--mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_init.yml2
-rwxr-xr-xmcp/scripts/salt.sh2
9 files changed, 152 insertions, 3 deletions
diff --git a/docs/release/release-notes/release-notes.rst b/docs/release/release-notes/release-notes.rst
index fd264e75f..b20b4dfc8 100644
--- a/docs/release/release-notes/release-notes.rst
+++ b/docs/release/release-notes/release-notes.rst
@@ -67,7 +67,7 @@ Release Data
| **Release designation** | Euphrates 5.0 |
| | |
+--------------------------------------+--------------------------------------+
-| **Release date** | October 6 2017 |
+| **Release date** | October 20 2017 |
| | |
+--------------------------------------+--------------------------------------+
| **Purpose of the delivery** | Euphrates alignment to Released |
diff --git a/docs/release/scenarios/os-nosdn-ovs-ha/index.rst b/docs/release/scenarios/os-nosdn-ovs-ha/index.rst
new file mode 100644
index 000000000..e0fcc7e7a
--- /dev/null
+++ b/docs/release/scenarios/os-nosdn-ovs-ha/index.rst
@@ -0,0 +1,16 @@
+.. _os-nosdn-ovs-ha:
+
+.. This work is licensed under a Creative Commons Attribution 4.0 International Licence.
+.. http://creativecommons.org/licenses/by/4.0
+.. (c) 2017 Mirantis Inc., Enea Software AB and others
+
+========================================
+os-nosdn-ovs-ha overview and description
+========================================
+
+.. toctree::
+ :numbered:
+ :maxdepth: 2
+
+ os-nosdn-ovs-ha.rst
+
diff --git a/docs/release/scenarios/os-nosdn-ovs-ha/os-nosdn-ovs-ha.rst b/docs/release/scenarios/os-nosdn-ovs-ha/os-nosdn-ovs-ha.rst
new file mode 100644
index 000000000..5e30ab542
--- /dev/null
+++ b/docs/release/scenarios/os-nosdn-ovs-ha/os-nosdn-ovs-ha.rst
@@ -0,0 +1,42 @@
+.. This work is licensed under a Creative Commons Attribution 4.0 International License.
+.. http://creativecommons.org/licenses/by/4.0
+.. (c)2017 Mirantis Inc., Enea Software AB and others
+
+This document provides scenario level details for Euphrates 5.0 of
+deployment with no SDN controller and no extra features enabled.
+
+============
+Introduction
+============
+
+This scenario is used primarily to validate and deploy a Ocata OpenStack
+deployment without any NFV features or SDN controller enabled.
+
+Scenario components and composition
+===================================
+
+This scenario is composed of common OpenStack services enabled by default,
+including Nova, Neutron, Glance, Cinder, Keystone, Horizon. It also installs
+the DPDK-enabled Open vSwitch component.
+
+All services are in HA, meaning that there are multiple cloned instances of
+each service, and they are balanced by HA Proxy using a Virtual IP Address
+per service.
+
+
+Scenario usage overview
+=======================
+
+Simply deploy this scenario by using the os-nosdn-ovs-ha.yaml deploy
+settings file.
+
+Limitations, Issues and Workarounds
+===================================
+
+None
+
+References
+==========
+
+For more information on the OPNFV Euphrates release, please visit
+http://www.opnfv.org/euphrates
diff --git a/docs/release/scenarios/os-nosdn-ovs-noha/index.rst b/docs/release/scenarios/os-nosdn-ovs-noha/index.rst
new file mode 100644
index 000000000..de9b657fb
--- /dev/null
+++ b/docs/release/scenarios/os-nosdn-ovs-noha/index.rst
@@ -0,0 +1,16 @@
+.. _os-nosdn-ovs-noha:
+
+.. This work is licensed under a Creative Commons Attribution 4.0 International Licence.
+.. http://creativecommons.org/licenses/by/4.0
+.. (c) 2017 Mirantis Inc., Enea Software AB and others
+
+==========================================
+os-nosdn-ovs-noha overview and description
+==========================================
+
+.. toctree::
+ :numbered:
+ :maxdepth: 2
+
+ os-nosdn-ovs-noha.rst
+
diff --git a/docs/release/scenarios/os-nosdn-ovs-noha/os-nosdn-ovs-noha.rst b/docs/release/scenarios/os-nosdn-ovs-noha/os-nosdn-ovs-noha.rst
new file mode 100644
index 000000000..7ac4e111a
--- /dev/null
+++ b/docs/release/scenarios/os-nosdn-ovs-noha/os-nosdn-ovs-noha.rst
@@ -0,0 +1,41 @@
+.. This work is licensed under a Creative Commons Attribution 4.0 International License.
+.. http://creativecommons.org/licenses/by/4.0
+.. (c) 2017 Mirantis Inc., Enea Software AB and others
+
+This document provides scenario level details for Euphrates 5.0 of
+deployment with no SDN controller and no extra features enabled.
+
+============
+Introduction
+============
+
+This scenario is used primarily to validate and deploy a Ocata OpenStack
+deployment without any NFV features or SDN controller enabled.
+
+
+Scenario components and composition
+===================================
+
+This scenario is composed of common OpenStack services enabled by default,
+including Nova, Neutron, Glance, Cinder, Keystone, Horizon. It also installs
+the DPDK-enabled Open vSwitch component.
+
+
+Scenario usage overview
+=======================
+
+Simply deploy this scenario by using the os-nosdn-ovs-ha.yaml deploy
+settings file.
+
+
+Limitations, Issues and Workarounds
+===================================
+
+Tested on virtual deploy only.
+
+References
+==========
+
+For more information on the OPNFV Euphrates release, please visit
+http://www.opnfv.org/euphrates
+
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/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_init.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_init.yml
index 4f1c55756..81f050f89 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_init.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/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: 3
+ horizon_identity_version: 2
mongodb_server_replica_set: ceilometer
mongodb_ceilometer_password: opnfv_secret
mongodb_admin_password: opnfv_secret
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