Merge "Bump Ocata" into stable/ocata
diff --git a/classes/cluster/virtual-mcp11-aio/openstack/init.yml b/classes/cluster/virtual-mcp11-aio/openstack/init.yml
index 880179b..1f815dd 100755
--- a/classes/cluster/virtual-mcp11-aio/openstack/init.yml
+++ b/classes/cluster/virtual-mcp11-aio/openstack/init.yml
@@ -189,44 +189,3 @@
server:
barbican:
enabled: ${_param:barbican_integration_enabled}
- runtest:
- enabled: True
- tempest:
- enabled: True
- cfg_dir: ${_param:runtest_tempest_cfg_dir}
- cfg_name: ${_param:runtest_tempest_cfg_name}
- DEFAULT:
- log_file: ${_param:runtest_tempest_log_file}
- compute:
- build_timeout: 600
- min_microversion: 2.1
- max_microversion: 2.42
- orchestration:
- max_template_size: 5440000
- max_resources_per_stack: 20000
- dns_feature_enabled:
- # Switch this to designate_admin_api_enabled once [1] is promoted to stable packages
- # [1] https://gerrit.mcp.mirantis.net/gitweb?p=salt-formulas/designate.git;a=commit;h=96a3f43f6cf1149559e54a00b5548bdf46333749
- api_admin: false
- api_v1: false
- api_v2: true
- api_v2_quotas: true
- api_v2_root_recordsets: true
- bug_1573141_fixed: true
- volume-feature-enabled:
- backup: false
- artifact_collector:
- enabled: true
- artifactory:
- enabled: true
- user: ${_param:artifactory_user}
- password: ${_param:artifactory_password}
- host: artifactory.mcp.mirantis.net
- port: 443
- proto: https
- endpoint: /oscore-local/${_param:cluster_domain}/${_param:infra_config_hostname}
- artifacts:
- sys_logs:
- path: /var/log
- etc:
- path: /etc