Small updates to work with queens
This patch adds some permanent/temporary changes to base aio model
for Queens.
Change-Id: I79856e3899e42c360c480240d614e93eccef390f
diff --git a/classes/cluster/virtual-mcp11-aio/infra/config.yml b/classes/cluster/virtual-mcp11-aio/infra/config.yml
index bd56cd6..3844b99 100644
--- a/classes/cluster/virtual-mcp11-aio/infra/config.yml
+++ b/classes/cluster/virtual-mcp11-aio/infra/config.yml
@@ -14,4 +14,12 @@
- salt-api
- python-cherrypy3
master:
- worker_threads: 5
\ No newline at end of file
+ worker_threads: 5
+ environment:
+ prd:
+ formula:
+ # Until patch to reclass-system is merged https://gerrit.mcp.mirantis.net/#/c/20665/
+ # and reclass bumped.
+ oslo_templates:
+ source: pkg
+ name: salt-formula-oslo-templates
diff --git a/classes/cluster/virtual-mcp11-aio/openstack/init.yml b/classes/cluster/virtual-mcp11-aio/openstack/init.yml
index be52b81..a2a08ef 100755
--- a/classes/cluster/virtual-mcp11-aio/openstack/init.yml
+++ b/classes/cluster/virtual-mcp11-aio/openstack/init.yml
@@ -262,6 +262,11 @@
identity:
admin:
api_version: 3
+ admin_identity:
+ admin:
+ api_version: ''
+ user_domain_name: 'Default'
+ project_domain_name: 'Default'
heat:
server:
database:
@@ -271,6 +276,12 @@
port: ${_param:rabbitmq_port}
ssl:
enabled: ${_param:rabbitmq_ssl_enabled}
+ # Until dependency with minimal version to python-tenacity is added.
+ linux:
+ system:
+ package:
+ python-tornado:
+ version: latest
runtest:
enabled: True
salttest: