Set minimum root disk size for nova-compute apps, format tidy

tests/distro-regression/tests/bundles/bionic-queens.yaml

@@ -1,7 +1,6 @@
 variables:
   source: &source proposed
   openstack-origin: &openstack-origin distro-proposed
-
 series: &series bionic
 applications:
   aodh:
@@ -149,7 +148,7 @@ applications:
       enable-resize: true
       migration-auth-type: ssh
       openstack-origin: *openstack-origin
-    constraints: mem=4096
+    constraints: root-disk=40G mem=4G
     channel: queens/edge
   openstack-dashboard:
     charm: ch:openstack-dashboard
@@ -206,125 +205,125 @@ applications:
     constraints: mem=1024
     channel: queens/edge
 relations:
-- - keystone:shared-db
-  - mysql:shared-db
-- - nova-cloud-controller:shared-db
-  - mysql:shared-db
-- - glance:shared-db
-  - mysql:shared-db
-- - cinder:shared-db
-  - mysql:shared-db
-- - heat:shared-db
-  - mysql:shared-db
-- - neutron-api:shared-db
-  - mysql:shared-db
-- - nova-cloud-controller:amqp
-  - rabbitmq-server:amqp
-- - nova-cloud-controller:image-service
-  - glance:image-service
-- - nova-cloud-controller:identity-service
-  - keystone:identity-service
-- - nova-compute:cloud-compute
-  - nova-cloud-controller:cloud-compute
-- - nova-compute:amqp
-  - rabbitmq-server:amqp
-- - nova-compute:image-service
-  - glance:image-service
-- - nova-compute:ceph
-  - ceph-mon:client
-- - glance:identity-service
-  - keystone:identity-service
-- - glance:ceph
-  - ceph-mon:client
-- - glance:image-service
-  - cinder:image-service
-- - glance:amqp
-  - rabbitmq-server:amqp
-- - cinder:amqp
-  - rabbitmq-server:amqp
-- - cinder:cinder-volume-service
-  - nova-cloud-controller:cinder-volume-service
-- - cinder:identity-service
-  - keystone:identity-service
-- - cinder:storage-backend
-  - cinder-ceph:storage-backend
-- - cinder-ceph:ceph
-  - ceph-mon:client
-- - neutron-gateway:quantum-network-service
-  - nova-cloud-controller:quantum-network-service
-- - openstack-dashboard:identity-service
-  - keystone:identity-service
-- - swift-proxy:identity-service
-  - keystone:identity-service
-- - swift-proxy:swift-storage
-  - swift-storage-z1:swift-storage
-- - swift-proxy:swift-storage
-  - swift-storage-z2:swift-storage
-- - swift-proxy:swift-storage
-  - swift-storage-z3:swift-storage
-- - ceilometer:identity-service
-  - keystone:identity-service
-- - ceilometer:amqp
-  - rabbitmq-server:amqp
-- - ceilometer-agent:nova-ceilometer
-  - nova-compute:nova-ceilometer
-- - ceilometer-agent:ceilometer-service
-  - ceilometer:ceilometer-service
-- - ceilometer-agent:amqp
-  - rabbitmq-server:amqp
-- - heat:identity-service
-  - keystone:identity-service
-- - heat:amqp
-  - rabbitmq-server:amqp
-- - neutron-gateway:amqp
-  - rabbitmq-server:amqp
-- - neutron-api:amqp
-  - rabbitmq-server:amqp
-- - neutron-api:neutron-api
-  - nova-cloud-controller:neutron-api
-- - neutron-api:neutron-plugin-api
-  - neutron-openvswitch:neutron-plugin-api
-- - neutron-api:identity-service
-  - keystone:identity-service
-- - neutron-api:neutron-plugin-api
-  - neutron-gateway:neutron-plugin-api
-- - neutron-openvswitch:neutron-plugin
-  - nova-compute:neutron-plugin
-- - neutron-openvswitch:amqp
-  - rabbitmq-server:amqp
-- - ceph-osd:mon
-  - ceph-mon:osd
-- - aodh:shared-db
-  - mysql:shared-db
-- - designate:shared-db
-  - mysql:shared-db
-- - aodh:amqp
-  - rabbitmq-server:amqp
-- - aodh:identity-service
-  - keystone:identity-service
-- - designate:identity-service
-  - keystone:identity-service
-- - designate:amqp
-  - rabbitmq-server:amqp
-- - designate:dns-backend
-  - designate-bind:dns-backend
-- - designate:coordinator-memcached
-  - memcached:cache
-- - gnocchi:shared-db
-  - mysql:shared-db
-- - gnocchi:storage-ceph
-  - ceph-mon:client
-- - gnocchi:amqp
-  - rabbitmq-server:amqp
-- - gnocchi:coordinator-memcached
-  - memcached:cache
-- - gnocchi:metric-service
-  - ceilometer:metric-service
-- - gnocchi:identity-service
-  - keystone:identity-service
-- - cinder-ceph:ceph-access
-  - nova-compute:ceph-access
-- - ceilometer:identity-credentials
-  - keystone:identity-credentials
-- - designate:dnsaas
-  - neutron-api:external-dns
+  - - keystone:shared-db
+    - mysql:shared-db
+  - - nova-cloud-controller:shared-db
+    - mysql:shared-db
+  - - glance:shared-db
+    - mysql:shared-db
+  - - cinder:shared-db
+    - mysql:shared-db
+  - - heat:shared-db
+    - mysql:shared-db
+  - - neutron-api:shared-db
+    - mysql:shared-db
+  - - nova-cloud-controller:amqp
+    - rabbitmq-server:amqp
+  - - nova-cloud-controller:image-service
+    - glance:image-service
+  - - nova-cloud-controller:identity-service
+    - keystone:identity-service
+  - - nova-compute:cloud-compute
+    - nova-cloud-controller:cloud-compute
+  - - nova-compute:amqp
+    - rabbitmq-server:amqp
+  - - nova-compute:image-service
+    - glance:image-service
+  - - nova-compute:ceph
+    - ceph-mon:client
+  - - glance:identity-service
+    - keystone:identity-service
+  - - glance:ceph
+    - ceph-mon:client
+  - - glance:image-service
+    - cinder:image-service
+  - - glance:amqp
+    - rabbitmq-server:amqp
+  - - cinder:amqp
+    - rabbitmq-server:amqp
+  - - cinder:cinder-volume-service
+    - nova-cloud-controller:cinder-volume-service
+  - - cinder:identity-service
+    - keystone:identity-service
+  - - cinder:storage-backend
+    - cinder-ceph:storage-backend
+  - - cinder-ceph:ceph
+    - ceph-mon:client
+  - - neutron-gateway:quantum-network-service
+    - nova-cloud-controller:quantum-network-service
+  - - openstack-dashboard:identity-service
+    - keystone:identity-service
+  - - swift-proxy:identity-service
+    - keystone:identity-service
+  - - swift-proxy:swift-storage
+    - swift-storage-z1:swift-storage
+  - - swift-proxy:swift-storage
+    - swift-storage-z2:swift-storage
+  - - swift-proxy:swift-storage
+    - swift-storage-z3:swift-storage
+  - - ceilometer:identity-service
+    - keystone:identity-service
+  - - ceilometer:amqp
+    - rabbitmq-server:amqp
+  - - ceilometer-agent:nova-ceilometer
+    - nova-compute:nova-ceilometer
+  - - ceilometer-agent:ceilometer-service
+    - ceilometer:ceilometer-service
+  - - ceilometer-agent:amqp
+    - rabbitmq-server:amqp
+  - - heat:identity-service
+    - keystone:identity-service
+  - - heat:amqp
+    - rabbitmq-server:amqp
+  - - neutron-gateway:amqp
+    - rabbitmq-server:amqp
+  - - neutron-api:amqp
+    - rabbitmq-server:amqp
+  - - neutron-api:neutron-api
+    - nova-cloud-controller:neutron-api
+  - - neutron-api:neutron-plugin-api
+    - neutron-openvswitch:neutron-plugin-api
+  - - neutron-api:identity-service
+    - keystone:identity-service
+  - - neutron-api:neutron-plugin-api
+    - neutron-gateway:neutron-plugin-api
+  - - neutron-openvswitch:neutron-plugin
+    - nova-compute:neutron-plugin
+  - - neutron-openvswitch:amqp
+    - rabbitmq-server:amqp
+  - - ceph-osd:mon
+    - ceph-mon:osd
+  - - aodh:shared-db
+    - mysql:shared-db
+  - - designate:shared-db
+    - mysql:shared-db
+  - - aodh:amqp
+    - rabbitmq-server:amqp
+  - - aodh:identity-service
+    - keystone:identity-service
+  - - designate:identity-service
+    - keystone:identity-service
+  - - designate:amqp
+    - rabbitmq-server:amqp
+  - - designate:dns-backend
+    - designate-bind:dns-backend
+  - - designate:coordinator-memcached
+    - memcached:cache
+  - - gnocchi:shared-db
+    - mysql:shared-db
+  - - gnocchi:storage-ceph
+    - ceph-mon:client
+  - - gnocchi:amqp
+    - rabbitmq-server:amqp
+  - - gnocchi:coordinator-memcached
+    - memcached:cache
+  - - gnocchi:metric-service
+    - ceilometer:metric-service
+  - - gnocchi:identity-service
+    - keystone:identity-service
+  - - cinder-ceph:ceph-access
+    - nova-compute:ceph-access
+  - - ceilometer:identity-credentials
+    - keystone:identity-credentials
+  - - designate:dnsaas
+    - neutron-api:external-dns