diff --git a/Documentation/RELEASE_NOTES.md b/Documentation/RELEASE_NOTES.md index 3fddd23060..70ad5f8c17 100644 --- a/Documentation/RELEASE_NOTES.md +++ b/Documentation/RELEASE_NOTES.md @@ -1,21 +1,8 @@ # Metro Automation Engine Release Notes -## Release 3.3.2 +## Release 3.3.3 ### Feature Enhancements -* Support Nuage VSD upgrade to 6.0.2 via Metro (METROAE-1121) -* Added support for openstack availability zone ### Resolved Issues -* Fix VSD node information to get Primary VSD information Rather than XMPP node info (METROAE-1093) -* Fixed issue with Active Standy VSTAT deploy with VSD in HA mode -* Add option to skip DNS host resolution checks when DNS servers are not reachable from MetroAE server (METROAE-1117) -* Fix VSC backup error during HA upgrade (METROAE-1120) -* Use correct vCenter variable references (METROAE-1122) -* Fix update of /etc/hosts on VCIN nodes (METROAE-1123) -* Mysql password change errors out while running security hardening (METROAE-1126) -* Fix VSD 'Set upgrade complete flag' fails with non-default csproot password (METROAE-1116) -* Use primary group instead of username when chown of backup dir (METROAE-1118) -* Fixes for portal start up order and docker-compose.yml bug -* VSTAT(ES) in-place upgrade fails with non-default root password (METROAE-1129) -* VSD standby cluster upgrade copies database multiple time on upgrade (METROAE-1130) +* Made openstack availability zone an optional parameter (METROAE-1154) diff --git a/metroae b/metroae index a47b555944..795c6fb51b 100755 --- a/metroae +++ b/metroae @@ -4,7 +4,7 @@ set -e # Wrapper around ansible-playbook for the installation of Nuage components # -METROAE_VERSION="v3.3.2" +METROAE_VERSION="v3.3.3" CURRENT_DIR=`pwd` PLAYBOOK_DIR=$CURRENT_DIR/src/playbooks diff --git a/src/roles/common/templates/vsc.j2 b/src/roles/common/templates/vsc.j2 index 8c0a464361..0c8be17487 100644 --- a/src/roles/common/templates/vsc.j2 +++ b/src/roles/common/templates/vsc.j2 @@ -127,7 +127,9 @@ openstack_mgmt_network: {{ item.1.openstack_mgmt_network }} openstack_mgmt_subnet: {{ item.1.openstack_mgmt_subnet }} openstack_control_network: {{ item.1.openstack_control_network }} openstack_control_subnet: {{ item.1.openstack_control_subnet }} +{% if item.1.openstack_availability_zone is defined %} openstack_availability_zone: {{ item.1.openstack_availability_zone }} +{% endif %} {% if item.1.openstack_mgmt_port_name is defined %} openstack_mgmt_port_name: {{ item.1.openstack_mgmt_port_name }} diff --git a/src/roles/common/templates/vsd.j2 b/src/roles/common/templates/vsd.j2 index e4b87ef9e1..5852e45801 100644 --- a/src/roles/common/templates/vsd.j2 +++ b/src/roles/common/templates/vsd.j2 @@ -104,7 +104,9 @@ openstack_image: {{ item.openstack_image }} openstack_flavor: {{ item.openstack_flavor }} openstack_network: {{ item.openstack_network }} openstack_subnet: {{ item.openstack_subnet }} +{% if item.openstack_availability_zone is defined %} openstack_availability_zone: {{ item.openstack_availability_zone }} +{% endif %} {% if item.openstack_port_name is defined %} openstack_port_name: {{ item.openstack_port_name }} {% endif %} diff --git a/src/roles/common/templates/vstat.j2 b/src/roles/common/templates/vstat.j2 index 9fb2f3dd04..a4c0e03e30 100644 --- a/src/roles/common/templates/vstat.j2 +++ b/src/roles/common/templates/vstat.j2 @@ -95,7 +95,9 @@ openstack_image: {{ item.openstack_image }} openstack_flavor: {{ item.openstack_flavor }} openstack_network: {{ item.openstack_network }} openstack_subnet: {{ item.openstack_subnet }} +{% if item.openstack_availability_zone is defined %} openstack_availability_zone: {{ item.openstack_availability_zone }} +{% endif %} {% if item.openstack_port_name is defined %} openstack_port_name: {{ item.openstack_port_name }} {% endif %}