commit e669939faf94c9a699c88bb9aa2d41236f068e2e
author mcp-jenkins <mcp-jenkins@mirantis.com> Wed Jan 23 10:11:01 2019 +0000
committer Gerrit Code Review <mail@domain.com> Wed Jan 23 10:11:01 2019 +0000
tree 72c0c1305bf6532e132ad155f629bf4824434762
parent 82a084f5e6b2992862e070c5cc3c4a14770e7bf2
parent 0e753f158e41bf75d4016b12e4d16a9e41120419

Merge "Fix default openstack_version in reclass" into release/2019.2.0

defaults/init.yml

diff --git a/defaults/init.yml b/defaults/init.yml
index 563b1a5..4231078 100644
--- a/defaults/init.yml
+++ b/defaults/init.yml
@@ -29,8 +29,6 @@
     banner_company_name: COMPANY_NAME
     motd_company_name: "${_param:banner_company_name}"
     ssh_banner_company_name: "${_param:banner_company_name}"
-    # Openstack globals
-    openstack_version: 'queens'
     # Docker artifact globals
     mcp_docker_registry: 'docker-prod-local.artifactory.mirantis.com'
     mcp_binary_registry: "https://${_param:mcp_docker_registry}/artifactory/binary-prod-local"

defaults/openstack/init.yml

diff --git a/defaults/openstack/init.yml b/defaults/openstack/init.yml
index d73dc71..ecac1b6 100644
--- a/defaults/openstack/init.yml
+++ b/defaults/openstack/init.yml
@@ -19,7 +19,7 @@
     openstack_memcache_security_strategy: 'ENCRYPT'
     openstack_memcached_proto_tcp_enabled: True
     openstack_memcached_proto_udp_enabled: False
-    openstack_version: ocata
+    openstack_version: queens
     openstack_old_version: ${_param:openstack_version}
     openstack_upgrade_enabled: False
     # Cinder