Merge "Create all-in-one model with ironic on pike" into stable/pike
diff --git a/classes/cluster/virtual-mcp11-aio/openstack/init.yml b/classes/cluster/virtual-mcp11-aio/openstack/init.yml
index 80742a3..e6e434d 100755
--- a/classes/cluster/virtual-mcp11-aio/openstack/init.yml
+++ b/classes/cluster/virtual-mcp11-aio/openstack/init.yml
@@ -137,6 +137,7 @@
rabbitmq_port: 5672 # for non-ssl use 5672/for ssl 5671
runtest_tempest_cfg_dir: /root/rally_reports/
runtest_tempest_cfg_name: tempest_generated.conf
+ runtest_tempest_log_file: /home/rally/rally_reports/tempest.log
runtest_tempest_public_net: public
artifactory_user: artifactory_user
artifactory_password: artifactory_password
@@ -311,8 +312,6 @@
convert_to_uuid:
network:
public_network_id: ${_param:runtest_tempest_public_net}
- DEFAULT:
- log_file: /home/rally/rally_reports/tempest.log
compute:
build_timeout: 600
min_microversion: 2.1
diff --git a/classes/system b/classes/system
index 72cafb3..288b4a1 160000
--- a/classes/system
+++ b/classes/system
@@ -1 +1 @@
-Subproject commit 72cafb3aa00193b5d491fed45e89306be8af8b8a
+Subproject commit 288b4a1da3c006aaa4f92968bb38d84e1df8ee31