Merge pull request #1870 from nuagenetworks/bt_err_fix_3

MetroAE v4.6.2 release
nuagenetworks · Dec 13, 2021 · 8fc5a2c · 8fc5a2c
2 parents 0159752 + 9b34434
commit 8fc5a2c
Show file tree

Hide file tree

Showing 49 changed files with 278 additions and 67 deletions.
diff --git a/Documentation/RELEASE_NOTES.md b/Documentation/RELEASE_NOTES.md
@@ -2,9 +2,9 @@
 
 ## Release info
 
-* MetroAE Version 4.6.1
-* Nuage Release Alignment 20.10
-* Date of Release 29-September-2021
+* MetroAE Version 4.6.2
+* Nuage Release Alignment 20.10.R6.3
+* Date of Release 13-December-2021
 
 ## Release Contents
 
@@ -14,9 +14,8 @@
 
 ### Resolved Issues
 
-* Install NUH without VSD on VCenter (METROAE-523)
-* Upgrade VSTATS if VSD GUI password has changed (METROAE-533)
-* Apply VSD license during upgrade (MetroAE-528)
+* Allow installing/renewal of VSTAT(ES) licenses during install, upgrade and standalone (METROAE-591)
+* Fix MetroAE VSD in-place upgrades for custom credentials (METROAE-586)
 
 ## Test Matrix
 

diff --git a/deployments/default/common.yml b/deployments/default/common.yml
@@ -320,6 +320,11 @@ dns_server_list: [ ]
 #
 # vsd_ejabberd_license_file: ""
 
+# < VSTAT License File >
+# Optional License File for Elasticsearch
+#
+# vstat_license_file: ""
+
 # < SD-WAN Portal License File >
 # Path to the license file for the SD-WAN Portal including the file name
 #

diff --git a/examples/active_standby_vsds/common.yml b/examples/active_standby_vsds/common.yml
@@ -240,6 +240,11 @@ dns_server_list: [ "10.1.0.2", ]
 #
 # vsd_ejabberd_license_file: ""
 
+# < VSTAT License File >
+# Optional License File for Elasticsearch
+#
+# vstat_license_file: ""
+
 # < SD-WAN Portal License File >
 # Path to the license file for the SD-WAN Portal including the file name
 #

diff --git a/examples/aws_sdwan_install/common.yml b/examples/aws_sdwan_install/common.yml
@@ -228,6 +228,11 @@ dns_server_list: [ "10.1.0.2", ]
 #
 # vsd_ejabberd_license_file: ""
 
+# < VSTAT License File >
+# Optional License File for Elasticsearch
+#
+# vstat_license_file: ""
+
 # < SD-WAN Portal License File >
 # Path to the license file for the SD-WAN Portal including the file name
 #

diff --git a/examples/aws_sdwan_upgrade/common.yml b/examples/aws_sdwan_upgrade/common.yml
@@ -228,6 +228,11 @@ dns_server_list: [ "10.1.0.2", ]
 #
 # vsd_ejabberd_license_file: ""
 
+# < VSTAT License File >
+# Optional License File for Elasticsearch
+#
+# vstat_license_file: ""
+
 # < SD-WAN Portal License File >
 # Path to the license file for the SD-WAN Portal including the file name
 #

diff --git a/examples/blank_deployment/common.yml b/examples/blank_deployment/common.yml
@@ -320,6 +320,11 @@ dns_server_list: [ ]
 #
 # vsd_ejabberd_license_file: ""
 
+# < VSTAT License File >
+# Optional License File for Elasticsearch
+#
+# vstat_license_file: ""
+
 # < SD-WAN Portal License File >
 # Path to the license file for the SD-WAN Portal including the file name
 #

diff --git a/examples/excel/active_standby_vsds.xlsx b/examples/excel/active_standby_vsds.xlsx
diff --git a/examples/excel/aws_sdwan_install.xlsx b/examples/excel/aws_sdwan_install.xlsx
diff --git a/examples/excel/aws_sdwan_upgrade.xlsx b/examples/excel/aws_sdwan_upgrade.xlsx
diff --git a/examples/excel/blank_deployment.xlsx b/examples/excel/blank_deployment.xlsx
diff --git a/examples/excel/kvm_datacenter_install.xlsx b/examples/excel/kvm_datacenter_install.xlsx
diff --git a/examples/excel/kvm_portal_install.xlsx b/examples/excel/kvm_portal_install.xlsx
diff --git a/examples/excel/kvm_sdwan_install.xlsx b/examples/excel/kvm_sdwan_install.xlsx
diff --git a/examples/excel/kvm_vsc_upgrade.xlsx b/examples/excel/kvm_vsc_upgrade.xlsx
diff --git a/examples/excel/kvm_vsd_install.xlsx b/examples/excel/kvm_vsd_install.xlsx
diff --git a/examples/excel/nsgv_bootstrap.xlsx b/examples/excel/nsgv_bootstrap.xlsx
diff --git a/examples/excel/openstack_install.xlsx b/examples/excel/openstack_install.xlsx
diff --git a/examples/excel/stats_out.xlsx b/examples/excel/stats_out.xlsx
diff --git a/examples/excel/upgrade_datacenter_vcenter.xlsx b/examples/excel/upgrade_datacenter_vcenter.xlsx
diff --git a/examples/excel/vcenter_datacenter_install.xlsx b/examples/excel/vcenter_datacenter_install.xlsx
diff --git a/examples/excel/vcenter_sdwan_install.xlsx b/examples/excel/vcenter_sdwan_install.xlsx
diff --git a/examples/kvm_datacenter_install/common.yml b/examples/kvm_datacenter_install/common.yml
@@ -240,6 +240,11 @@ dns_server_list: [ "10.1.0.2", ]
 #
 # vsd_ejabberd_license_file: ""
 
+# < VSTAT License File >
+# Optional License File for Elasticsearch
+#
+# vstat_license_file: ""
+
 # < SD-WAN Portal License File >
 # Path to the license file for the SD-WAN Portal including the file name
 #

diff --git a/examples/kvm_portal_install/common.yml b/examples/kvm_portal_install/common.yml
@@ -240,6 +240,11 @@ dns_server_list: [ "10.1.0.2", ]
 #
 # vsd_ejabberd_license_file: ""
 
+# < VSTAT License File >
+# Optional License File for Elasticsearch
+#
+# vstat_license_file: ""
+
 # < SD-WAN Portal License File >
 # Path to the license file for the SD-WAN Portal including the file name
 #

diff --git a/examples/kvm_sdwan_install/common.yml b/examples/kvm_sdwan_install/common.yml
@@ -240,6 +240,11 @@ dns_server_list: [ "10.1.0.2", ]
 #
 # vsd_ejabberd_license_file: ""
 
+# < VSTAT License File >
+# Optional License File for Elasticsearch
+#
+# vstat_license_file: ""
+
 # < SD-WAN Portal License File >
 # Path to the license file for the SD-WAN Portal including the file name
 #

diff --git a/examples/kvm_vsc_upgrade/common.yml b/examples/kvm_vsc_upgrade/common.yml
@@ -240,6 +240,11 @@ dns_server_list: [ "10.1.0.2", ]
 #
 # vsd_ejabberd_license_file: ""
 
+# < VSTAT License File >
+# Optional License File for Elasticsearch
+#
+# vstat_license_file: ""
+
 # < SD-WAN Portal License File >
 # Path to the license file for the SD-WAN Portal including the file name
 #

diff --git a/examples/kvm_vsd_install/common.yml b/examples/kvm_vsd_install/common.yml
@@ -240,6 +240,11 @@ dns_server_list: [ "10.1.0.2", ]
 #
 # vsd_ejabberd_license_file: ""
 
+# < VSTAT License File >
+# Optional License File for Elasticsearch
+#
+# vstat_license_file: ""
+
 # < SD-WAN Portal License File >
 # Path to the license file for the SD-WAN Portal including the file name
 #

diff --git a/examples/nsgv_bootstrap/common.yml b/examples/nsgv_bootstrap/common.yml
@@ -240,6 +240,11 @@ dns_server_list: [ "10.1.0.2", ]
 #
 # vsd_ejabberd_license_file: ""
 
+# < VSTAT License File >
+# Optional License File for Elasticsearch
+#
+# vstat_license_file: ""
+
 # < SD-WAN Portal License File >
 # Path to the license file for the SD-WAN Portal including the file name
 #

diff --git a/examples/openstack_install/common.yml b/examples/openstack_install/common.yml
@@ -257,6 +257,11 @@ openstack_auth_url: "http://10.0.0.10:5000/v2.0"
 #
 # vsd_ejabberd_license_file: ""
 
+# < VSTAT License File >
+# Optional License File for Elasticsearch
+#
+# vstat_license_file: ""
+
 # < SD-WAN Portal License File >
 # Path to the license file for the SD-WAN Portal including the file name
 #

diff --git a/examples/stats_out/common.yml b/examples/stats_out/common.yml
@@ -240,6 +240,11 @@ stats_out_proxy: "192.168.120.150"
 #
 # vsd_ejabberd_license_file: ""
 
+# < VSTAT License File >
+# Optional License File for Elasticsearch
+#
+# vstat_license_file: ""
+
 # < SD-WAN Portal License File >
 # Path to the license file for the SD-WAN Portal including the file name
 #

diff --git a/examples/upgrade_datacenter_vcenter/common.yml b/examples/upgrade_datacenter_vcenter/common.yml
@@ -281,6 +281,11 @@ vcenter_ovftool: "/usr/bin/ovftool"
 #
 # vsd_ejabberd_license_file: ""
 
+# < VSTAT License File >
+# Optional License File for Elasticsearch
+#
+# vstat_license_file: ""
+
 # < SD-WAN Portal License File >
 # Path to the license file for the SD-WAN Portal including the file name
 #

diff --git a/examples/vcenter_datacenter_install/common.yml b/examples/vcenter_datacenter_install/common.yml
@@ -281,6 +281,11 @@ vcenter_ovftool: "/usr/bin/ovftool"
 #
 # vsd_ejabberd_license_file: ""
 
+# < VSTAT License File >
+# Optional License File for Elasticsearch
+#
+# vstat_license_file: ""
+
 # < SD-WAN Portal License File >
 # Path to the license file for the SD-WAN Portal including the file name
 #

diff --git a/examples/vcenter_sdwan_install/common.yml b/examples/vcenter_sdwan_install/common.yml
@@ -281,6 +281,11 @@ vcenter_ovftool: "/usr/bin/ovftool"
 #
 # vsd_ejabberd_license_file: ""
 
+# < VSTAT License File >
+# Optional License File for Elasticsearch
+#
+# vstat_license_file: ""
+
 # < SD-WAN Portal License File >
 # Path to the license file for the SD-WAN Portal including the file name
 #

diff --git a/sample_deployment.xlsx b/sample_deployment.xlsx