Merge "Do not include service.runtest by default" into stable/ocata
diff --git a/classes/cluster/virtual-mcp11-aio/openstack/init.yml b/classes/cluster/virtual-mcp11-aio/openstack/init.yml
index 2185a76..36d9dd4 100755
--- a/classes/cluster/virtual-mcp11-aio/openstack/init.yml
+++ b/classes/cluster/virtual-mcp11-aio/openstack/init.yml
@@ -134,6 +134,7 @@
glance_image_cirros_location: 'https://artifactory.mcp.mirantis.net/artifactory/test-images/cirros-0.3.5-x86_64-disk.img'
glance_image_fedora_location: 'https://artifactory.mcp.mirantis.net/artifactory/test-images/Fedora-Cloud-Base-27-1.6.x86_64.qcow2'
openstack_control_address: ${_param:single_address}
+ glance_cors_allowed_origin: "http://${_param:single_address}:8078"
galera:
master:
innodb_buffer_pool_size: 1024M
diff --git a/classes/system b/classes/system
index cab1ae0..13349ed 160000
--- a/classes/system
+++ b/classes/system
@@ -1 +1 @@
-Subproject commit cab1ae01c2ab31942148f0754d172c24fb7845b8
+Subproject commit 13349edf1ea6e9972594de8379b085f898835f01