diff --git a/bundles/openstack/bundle-config.yaml b/bundles/openstack/bundle-config.yaml
index 1a643ce7fbbcd8acb0f991a6eb1ad499abc049e4..600fc17664a810acd055989f83209eeb35c22844 100644
--- a/bundles/openstack/bundle-config.yaml
+++ b/bundles/openstack/bundle-config.yaml
@@ -180,8 +180,6 @@ services:
       admin-token: *admin_token
       nagios_context: *nagios_context
       os-public-hostname: *os_public_hostname
-      worker-multiplier: *worker_multiplier
-      preferred-api-version: *preferred_api_version
       region: *region
       vip: *vip_keystone
 
@@ -211,7 +209,6 @@ services:
     options:
       config-flags: *nova_compute_config_flags
       os-internal-network: &os_internal_network
-      libvirt-image-backend: *libvirt_image_backend
       nagios_context: *nagios_context
 
   nova-cloud-controller:
@@ -236,7 +233,6 @@ services:
       console-proxy-ip: *console_proxy_ip
       nagios_context: *nagios_context
       vip: *vip_nova_cloud_controller
-      worker-multiplier: *worker_multiplier
 
   neutron-api:
     bindings:
@@ -252,14 +248,11 @@ services:
       cluster: *network_space_os_mgmt
     options:
       region: *region
-      flat-network-providers: *flat_network_providers
       nagios_context: *nagios_context
       neutron-external-network: *neutron_external_network
-      network-device-mtu: *network_device_mtu
       vip: *vip_neutron
 
   neutron-openvswitch:
-    series: *series
     bindings:
       "": *network_space_default
       amqp: *network_space_os_mgmt
@@ -267,7 +260,6 @@ services:
       neutron-plugin: *network_space_os_mgmt
       neutron-plugin-api: *network_space_os_mgmt
     options:
-      flat-network-providers: *flat_network_providers
       os-data-network: *os_data_network
 
   cinder:
diff --git a/bundles/openstack/bundle.allinone.yaml b/bundles/openstack/bundle.allinone.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..1a9af31441caaaeec8d60a29e0372a4bd518cc58
--- /dev/null
+++ b/bundles/openstack/bundle.allinone.yaml
@@ -0,0 +1,950 @@
+## Sample bundle for the deployment of OpenStack in a region of the
+## GARR Federated Cloud Platform.
+
+parameters:
+  # sources
+  openstack-origin: &openstack_origin   cloud:xenial-ocata
+  series: &series  xenial
+
+  # Ceph configs
+  ceph-radosgw-lightweight-pool-pg-num:  &ceph_radosgw_lightweight_pool_pg_num  8
+  ceph-radosgw-rgw-buckets-pool-weight:  &ceph_radosgw_rgw_buckets_pool_weight  5
+  ceph-radosgw-config-flags:  &ceph_radosgw_config_flags
+
+  # network defaults:
+  flat-network-providers: &flat_network_providers  ext_net
+  neutron-external-network: &neutron_external_network ext_net
+  network-device-mtu: &network_device_mtu  1500
+  instance-mtu: &instance_mtu	1400
+  enable-dvr: &dvr-mode		True
+  vlan-ranges: &vlan_ranges	physnet-ovs:801:801
+
+  # keystone/dashboard
+  preferred-api-version: &preferred_api_version     3
+
+  # nova-compute
+  worker-multiplier: &worker_multiplier             '1.0'
+  cpu-allocation-ratio: &cpu_allocation_ratio       '2.0'
+  ram-allocation-ratio: &ram_allocation_ratio       '1.5'
+  n-c-config-flags: &nova_compute_config_flags    "block_device_allocate_retries=600,block_device_allocate_retries_interval=5"
+
+  hugepages: &hugepages    '5%'
+  libvirt-image-backend: &libvirt_image_backend
+  cpu-mode: &cpu-mode
+
+# Ceilometer
+  event-time-to-live: &celiometer_event_time_to_live -1
+  metering-time-to-live: &celiometer_metering_time_to_live -1
+
+## Specific configuration file for a cloud region.
+## Edit values within <...> to represent your region.
+  # Region settings
+  region: &region                               <region>
+  access-network: &access_network               <network_used_by_rabbit_and_percona>
+  source_ntp: &source_ntp             <NTP_server>
+  os-data-network: &os_data_network   <OS_data_network>
+
+  # Nagios
+  nagios_context: &nagios_context               <nagios_context>
+  nagios_admin_email: &nagios_admin_email       <nagiosadmin@domain.org>
+  nagios_admin_pwd: &nagiosadmin_pwd            <aVeryDifficultPwd>
+  nagios_readonly_pwd: &nagiosro_pwd            <aDifficultPwd>
+
+  # Ceph configs
+  ceph-fsid: &ceph_fsid   <FSID_here>
+  ceph-monitor-hosts: &ceph_monitor_hosts    [cephmon1:port[ cephmon2:port cephmon3:port]]
+  ceph-admin-key: &ceph_admin_key    <ceph_admin_key_here>
+
+  ceph-radosgw-pool-prefix: &ceph_radosgw_pool_prefix    rgw
+  ceph-radosgw-ceph-osd-replication-count: &ceph_radosgw_replication_count  2
+
+  vip-ceilometer: &vip_ceilometer       <VIP_priv_8> <VIP_pub_8>
+  vip-ceph-radosgw: &vip_ceph_radosgw   <VIP_priv_7> <VIP_pub_7>
+  vip-cinder: &vip_cinder               <VIP_priv_0> <VIP_pub_0>
+  vip-glance: &vip_glance               <VIP_priv_5> <VIP_pub_5>
+  vip-heat: &vip_heat                   <VIP_priv_4> <VIP_pub_4>
+  vip-dashboard: &vip_dashboard         <VIP_pub_2>
+  vip-keystone: &vip_keystone           <VIP_priv_1> <VIP_pub_1>
+  vip-percona: &vip_percona             <VIP_priv_2>
+  vip-neutron: &vip_neutron             <VIP_priv_6> <VIP_pub_6>
+  vip-nova: &vip_nova_cloud_controller  <VIP_priv_3> <VIP_pub_3>
+  console-proxy-ip: &console_proxy_ip   <VIP_pub_3>
+  # This is the gateway for public VIPs
+  default_public_gateway: &default_public_gateway  <default_public_gateway_in_CIDR_notation>
+
+  # hostnames
+  os-public-hostname: &os_public_hostname  <keystone_public_hostname>
+  os-internal-hostname: &os_internal_hostname  <keystone_internal_hostname>
+  # this one could be identical to internal-hostname
+  os-admin-hostname: &os_admin_hostname  <keystone_admin_hostname>
+
+  # network setup: should be the same cross-sites
+  ### Use network-space-* in bindings unless os-admin-* is usable instead
+  network-space-default: &network_space_default	<MAAS_OS_mgmt_space>
+  network-space-pub: &network_space_pub		<MAAS_pub_space>
+  network-space-os-data: &network_space_os_data	<MAAS_OS_data_space>
+  network-space-os-mgmt: &network_space_os_mgmt	<MAAS_OS_mgmt_space>
+
+  # Change as appropriate
+  bridge-mappings: &bridge_mappings             ext_net:br-ex
+  data-port: &data_port				br-ex:bond0.188
+
+  # secrets and passwords:
+  root-password: &root_password  <root_password>
+  sst-password:  &sst_password   <sst_password>
+  admin-password: &admin_password  <admin_password>
+  secret_dashboard: &secret_dashboard   <secret>
+  encryption-key: &encryption_key       <encryption_key>
+#
+#  Set your corosync_keys by running (on your preferred machine):
+#  corosync-keygen ; cat /etc/corosync/authkey | base64 -w 0 ; echo " "
+  corosync_key: &corosync_key   <corosync_key>
+
+  # keystone/dashboard
+  admin-token: &admin_token  <admin_token>
+
+# ------------------------------------------------------------------------------
+machines:
+  '0':
+    constraints: arch=amd64 tags=neutron-gw
+    series: *series
+  '1':
+    constraints: arch=amd64 tags=controller
+    series: *series
+  '2':
+    constraints: arch=amd64 tags=controller
+    series: *series
+  '3':
+    constraints: arch=amd64 tags=compute
+    series: *series
+
+# ------------------------------------------------------------------------------
+services:
+
+  controller:
+    charm: cs:ubuntu
+    series: *series
+    num_units: 3
+    bindings:
+      "": *network_space_default
+    to:
+      - '1'
+      - '2'
+    annotations:
+      gui-x: '2000'
+      gui-y: '0'
+
+  compute-host:
+    charm: cs:ubuntu
+    series: *series
+    num_units: 1
+    to:
+      - '3'
+    annotations:
+      gui-x: '2000'
+      gui-y: '500'
+
+  network-host:
+    charm: cs:ubuntu
+    series: *series
+    num_units: 1
+    to:
+      - '0'
+    annotations:
+      gui-x: '2000'
+      gui-y: '800'
+
+  ntp:
+    charm: cs:ntp
+    series: *series
+    options:
+      action-managed-upgrade: True
+      source: *source_ntp
+    annotations:
+      gui-x: '2200'
+      gui-y: '500'
+
+  defaultgw:
+    charm: cs:~csd-garr/defaultgw
+    options:
+      gateway: *default_public_gateway
+    annotations:
+      gui-x: '800'
+      gui-y: '0'
+
+  ceph-radosgw-hacluster:
+    charm: cs:hacluster
+    series: *series
+    bindings:
+      "": *network_space_os_mgmt
+    options:
+      action-managed-upgrade: True
+      corosync_key: *corosync_key
+      corosync_transport: 'unicast'
+      nagios_context: *nagios_context
+      nagios_servicegroups: ceph,object,storage
+    annotations:
+      gui-x: '1000'
+      gui-y: '-200'
+
+  cinder-hacluster:
+    charm: cs:hacluster
+    series: *series
+    bindings:
+      "": *network_space_os_mgmt
+    options:
+      corosync_key: *corosync_key
+      nagios_context: *nagios_context
+      action-managed-upgrade: True
+      corosync_transport: 'unicast'
+      nagios_servicegroups: ceph,block,storage
+    annotations:
+      gui-x: '1250'
+      gui-y: '350'
+
+  controller-hacluster:
+    charm: cs:hacluster
+    series: *series
+    bindings:
+      "": *network_space_os_mgmt
+    options:
+      corosync_key: *corosync_key
+      nagios_context: *nagios_context
+      action-managed-upgrade: True
+      corosync_transport: 'unicast'
+      nagios_servicegroups: nova,compute
+    annotations:
+      gui-x: '-200'
+      gui-y: '500'
+
+  glance-hacluster:
+    charm: cs:hacluster
+    series: *series
+    bindings:
+      "": *network_space_os_mgmt
+    options:
+      corosync_key: *corosync_key
+      nagios_context: *nagios_context
+      action-managed-upgrade: True
+      corosync_transport: 'unicast'
+      nagios_servicegroups: ceph,object,storage
+    annotations:
+      gui-x: '1200'
+      gui-y: '600'
+
+  horizon-hacluster:
+    charm: cs:hacluster
+    series: *series
+    bindings:
+      "": *network_space_os_mgmt
+    options:
+      corosync_key: *corosync_key
+      nagios_context: *nagios_context
+      action-managed-upgrade: True
+      corosync_transport: 'unicast'
+      nagios_servicegroups: dashboard,web
+    annotations:
+      gui-x: '250'
+      gui-y: '50'
+
+  keystone-hacluster:
+    charm: cs:hacluster
+    series: *series
+    bindings:
+      "": *network_space_os_mgmt
+    options:
+      corosync_key: *corosync_key
+      nagios_context: *nagios_context
+      action-managed-upgrade: True
+      corosync_transport: 'unicast'
+      nagios_servicegroups: keystone
+    annotations:
+      gui-x: '350'
+      gui-y: '350'
+
+  neutron-api-hacluster:
+    charm: cs:hacluster
+    series: *series
+    bindings:
+      "": *network_space_os_mgmt
+    options:
+      corosync_key: *corosync_key
+      nagios_context: *nagios_context
+      action-managed-upgrade: True
+      corosync_transport: 'unicast'
+      nagios_servicegroups: neutron
+    annotations:
+      gui-x: '550'
+      gui-y: '1350'
+
+  percona-hacluster:
+    charm: cs:hacluster
+    series: *series
+    bindings:
+      "": *network_space_os_mgmt
+    options:
+      corosync_key: *corosync_key
+      nagios_context: *nagios_context
+      action-managed-upgrade: True
+      corosync_transport: 'unicast'
+      nagios_servicegroups: database
+    annotations:
+      gui-x: '1300'
+      gui-y: '800'
+
+# Nagios
+  nagios-server:
+    charm: cs:nagios
+    series: *series
+    num_units: 1
+    bindings:
+      "": *network_space_os_mgmt
+      website: *network_space_pub
+    options:
+      admin_email: *nagios_admin_email
+      password: *nagiosadmin_pwd
+      ro-password: *nagiosro_pwd
+      action-managed-upgrade: True
+      monitor_self: true
+    to:
+      - 'lxd:2'
+  nrpe-controller:
+    charm: cs:nrpe
+    series: *series
+    options:
+      swap: '-w 40% -c 25% -n ok'
+  nrpe-cinder:
+    charm: cs:nrpe
+    series: *series
+    options:
+      swap: '-w 40% -c 25% -n ok'
+  nrpe-glance:
+    charm: cs:nrpe
+    series: *series
+    options:
+      swap: '-w 40% -c 25% -n ok'
+  nrpe-radosgw:
+    charm: cs:nrpe
+    series: *series
+    options:
+      swap: '-w 40% -c 25% -n ok'
+  nrpe-keystone:
+    charm: cs:nrpe
+    series: *series
+    options:
+      swap: '-w 40% -c 25% -n ok'
+  nrpe-dashboard:
+    charm: cs:nrpe
+    series: *series
+    options:
+      swap: '-w 40% -c 25% -n ok'
+  nrpe-neutron:
+    charm: cs:nrpe
+    series: *series
+    options:
+      swap: '-w 40% -c 25% -n ok'
+  nrpe-neutrongw:
+    charm: cs:nrpe
+    series: *series
+    options:
+      swap: '-w 40% -c 25% -n ok'
+  nrpe-nova:
+    charm: cs:nrpe
+    series: *series
+    options:
+      swap: '-w 40% -c 25% -n ok'
+  nrpe-novacompute:
+    charm: cs:nrpe
+    series: *series
+    options:
+      swap: '-w 40% -c 25% -n ok'
+  nrpe-percona:
+    charm: cs:nrpe
+    series: *series
+    options:
+      swap: '-w 40% -c 25% -n ok'
+  nrpe-rabbitmq:
+    charm: cs:nrpe
+    series: *series
+    options:
+      swap: '-w 40% -c 25% -n ok'
+  nrpe-memcache:
+    charm: cs:nrpe
+    series: *series
+    options:
+      swap: '-w 40% -c 25% -n ok'
+
+  rabbitmq-server:
+    charm: cs:rabbitmq-server
+    series: *series
+    num_units: 3
+    bindings:
+      "": *network_space_default
+      amqp: *network_space_os_mgmt
+    options:
+      access-network: *access_network
+      nagios_context: *nagios_context
+      action-managed-upgrade: True
+      min-cluster-size: 2
+      cluster-partition-handling: pause_minority
+      management_plugin: True
+      nagios_servicegroups: messaging
+      use-syslog: True
+    to:
+      - 'lxd:2'
+      - 'lxd:1'
+    annotations:
+      gui-x: '400'
+      gui-y: '800'
+
+  percona-cluster:
+    charm: cs:percona-cluster
+    series: *series
+    num_units: 3
+    bindings:
+      "": *network_space_default
+      shared-db: *network_space_os_mgmt
+      cluster: *network_space_os_mgmt
+    options:
+      access-network: *access_network
+      cluster-network: *access_network
+      nagios_context: *nagios_context
+      root-password: *root_password
+      sst-password: *sst_password
+      vip: *vip_percona
+      action-managed-upgrade: True
+      min-cluster-size: 2
+      innodb-buffer-pool-size: 10G
+      lp1366997-workaround: True
+      max-connections: 30000
+      nagios_servicegroups: database
+    to:
+      - 'lxd:1'
+      - 'lxd:2'
+    annotations:
+      gui-x: '1000'
+      gui-y: '800'
+
+  keystone:
+    charm: cs:keystone
+    series: *series
+    num_units: 3
+    bindings:
+      "": *network_space_default
+      public: *network_space_pub
+      admin: *network_space_os_mgmt
+      internal: *network_space_os_mgmt
+      shared-db: *network_space_os_mgmt
+      cluster: *network_space_os_mgmt
+    options:
+      openstack-origin: *openstack_origin
+      admin-password: *admin_password
+      admin-token: *admin_token
+      nagios_context: *nagios_context
+      os-public-hostname: *os_public_hostname
+      region: *region
+      vip: *vip_keystone
+      openstack-origin: *openstack_origin
+      action-managed-upgrade: True
+      debug: 'False'
+      verbose: 'False'
+      admin-user: admin
+      nagios_servicegroups: keystone
+      worker-multiplier: *worker_multiplier
+      preferred-api-version: *preferred_api_version
+      region: *region
+      use-syslog: True
+    to:
+      - 'lxd:2'
+      - 'lxd:1'
+    annotations:
+      gui-x: '500'
+      gui-y: '500'
+
+  openstack-dashboard:
+    charm: cs:openstack-dashboard
+    series: *series
+    num_units: 3
+    bindings:
+      "": *network_space_default
+      shared-db: *network_space_os_mgmt
+      cluster: *network_space_os_mgmt
+      website: *network_space_pub
+      dashboard-plugin: *network_space_os_mgmt
+      identity-service: *network_space_os_mgmt
+    options:
+      openstack-origin: *openstack_origin
+      nagios_context: *nagios_context
+      secret: *secret_dashboard
+      vip: *vip_dashboard
+      openstack-origin: *openstack_origin
+      action-managed-upgrade: True
+      debug: 'False'
+      endpoint-type: internalURL,publicURL
+      nagios_servicegroups: dashboard,web
+      use-syslog: True
+      webroot: '/'
+    to:
+      - 'lxd:1'
+      - 'lxd:2'
+    annotations:
+      gui-x: '500'
+      gui-y: '0'
+
+  nova-compute:
+    charm: cs:nova-compute
+    series: *series
+    num_units: 1
+    bindings:
+      "": *network_space_default
+      amqp: *network_space_os_mgmt
+      cloud-compute: *network_space_os_mgmt
+      image-service: *network_space_os_mgmt
+      ceph: *network_space_os_mgmt
+      compute-peer: *network_space_os_mgmt
+      neutron-plugin: *network_space_os_mgmt
+    options:
+      config-flags: *nova_compute_config_flags
+      os-internal-network: &os_internal_network
+      nagios_context: *nagios_context
+      openstack-origin: *openstack_origin
+      action-managed-upgrade: True
+      debug: 'False'
+      verbose: 'False'
+      cpu-mode: *cpu-mode
+      enable-live-migration: False
+      enable-resize: False
+      migration-auth-type: none
+      libvirt-image-backend: *libvirt_image_backend
+      nagios_servicegroups: nova,compute
+      use-internal-endpoints: True
+      enable-resize: True
+      enable-live-migration: True
+    to:
+      - '3'
+    annotations:
+      gui-x: '0'
+      gui-y: '200'
+
+  nova-cloud-controller:
+    charm: cs:nova-cloud-controller
+    series: *series
+    num_units: 3
+    bindings:
+      "": *network_space_default
+      public: *network_space_pub
+      admin: *network_space_os_mgmt
+      internal: *network_space_os_mgmt
+      amqp: *network_space_os_mgmt
+      cinder-volume-service: *network_space_os_mgmt
+      identity-service: *network_space_os_mgmt
+      image-service: *network_space_os_mgmt
+      quantum-network-service: *network_space_os_mgmt
+      cloud-compute: *network_space_os_mgmt
+      neutron-api: *network_space_os_mgmt
+#      cell: ###
+      memcache: *network_space_os_mgmt
+      shared-db: *network_space_os_mgmt
+      cluster: *network_space_os_mgmt
+    options:
+      region: *region
+      console-proxy-ip: *console_proxy_ip
+      nagios_context: *nagios_context
+      vip: *vip_nova_cloud_controller
+      openstack-origin: *openstack_origin
+      action-managed-upgrade: True
+      debug: 'False'
+      verbose: 'False'
+      region: *region
+      console-access-protocol: 'vnc'
+      nagios_servicegroups: nova,compute
+      network-manager: Neutron
+      cpu-allocation-ratio: *cpu_allocation_ratio
+      ram-allocation-ratio: *ram_allocation_ratio
+      service-guard: True
+      single-nova-consoleauth: False
+      use-internal-endpoints: True
+      worker-multiplier: *worker_multiplier
+    to:
+      - 'lxd:1'
+      - 'lxd:2'
+    annotations:
+      gui-x: '0'
+      gui-y: '450'
+
+  neutron-api:
+    charm: cs:neutron-api
+    series: *series
+    num_units: 3
+    bindings:
+      "": *network_space_default
+      public: *network_space_pub
+      admin: *network_space_os_mgmt
+      internal: *network_space_os_mgmt
+      amqp: *network_space_os_mgmt
+      identity-service: *network_space_os_mgmt
+      neutron-api: *network_space_os_mgmt
+      neutron-plugin-api: *network_space_os_mgmt
+      shared-db: *network_space_os_mgmt
+      cluster: *network_space_os_mgmt
+    options:
+      region: *region
+      nagios_context: *nagios_context
+      neutron-external-network: *neutron_external_network
+      vip: *vip_neutron
+      openstack-origin: *openstack_origin
+      action-managed-upgrade: True
+      debug: 'False'
+      verbose: 'False'
+      region: *region
+      enable-ml2-port-security: True
+      flat-network-providers: *flat_network_providers
+      nagios_servicegroups: neutron
+      neutron-security-groups: True
+      network-device-mtu: *network_device_mtu
+      use-internal-endpoints: True
+      use-syslog: True
+      worker-multiplier: *worker_multiplier
+    to:
+      - 'lxd:2'
+      - 'lxd:1'
+    annotations:
+      gui-x: '500'
+      gui-y: '1100'
+
+  neutron-openvswitch:
+    charm: cs:neutron-openvswitch
+    series: *series
+    bindings:
+      "": *network_space_default
+      amqp: *network_space_os_mgmt
+      data: *network_space_os_data
+      neutron-plugin: *network_space_os_mgmt
+      neutron-plugin-api: *network_space_os_mgmt
+    options:
+      os-data-network: *os_data_network
+      action-managed-upgrade: True
+      debug: 'False'
+      verbose: 'False'
+      disable-security-groups: False
+      flat-network-providers: *flat_network_providers
+      use-syslog: True
+    annotations:
+      gui-x: '1100'
+      gui-y: '1100'
+
+  cinder:
+    charm: cs:cinder
+    series: *series
+    num_units: 3
+    options:
+      nagios_context: *nagios_context
+      region: *region
+      vip: *vip_cinder
+      openstack-origin: *openstack_origin
+      action-managed-upgrade: True
+      block-device: None
+      glance-api-version: 3
+      nagios_servicegroups: ceph,block,storage
+      region: *region
+      use-syslog: True
+      use-internal-endpoints: True
+      worker-multiplier: *worker_multiplier
+    to:
+      - 'lxd:1'
+      - 'lxd:2'
+    annotations:
+      gui-x: '1000'
+      gui-y: '200'
+
+  cinder-ceph:
+    charm: cs:cinder-ceph
+    series: *series
+    num_units: 0
+    bindings:
+      "": *network_space_default
+      ceph: *network_space_os_mgmt
+    options:
+      action-managed-upgrade: True
+      restrict-ceph-pools: True
+    annotations:
+      gui-x: '1330'
+      gui-y: '230'
+
+  ceph-proxy:
+    charm: cs:ceph-proxy
+    series: *series
+    num_units: 1
+    bindings:
+      "": *network_space_default
+      public: *network_space_os_mgmt
+      client: *network_space_os_mgmt
+      radosgw: *network_space_os_mgmt
+    options:
+      fsid: *ceph_fsid
+      monitor-hosts: *ceph_monitor_hosts
+      admin-key: *ceph_admin_key
+    to:
+      - 'lxd:1'
+    annotations:
+      gui-x: '1300'
+      gui-y: '0'
+
+  ceph-radosgw:
+    charm: cs:ceph-radosgw
+    series: *series
+    num_units: 3
+    bindings:
+      "": *network_space_default
+      public: *network_space_pub
+      admin: *network_space_os_mgmt
+      internal: *network_space_os_mgmt
+      cluster: *network_space_os_mgmt
+    options:
+      ceph-osd-replication-count: *ceph_radosgw_replication_count
+      config-flags: *ceph_radosgw_config_flags
+      nagios_context: *nagios_context
+      pool-prefix: *ceph_radosgw_pool_prefix
+      region: *region
+      rgw-buckets-pool-weight:  *ceph_radosgw_rgw_buckets_pool_weight
+      rgw-lightweight-pool-pg-num: *ceph_radosgw_lightweight_pool_pg_num
+      vip: *vip_ceph_radosgw
+      action-managed-upgrade: True
+      nagios_servicegroups: ceph,object,storage
+      region: *region
+      restrict-ceph-pools: True
+      use-syslog: True
+    to:
+      - 'lxd:1'
+      - 'lxd:2'
+    annotations:
+      "gui-x": "1000"
+      "gui-y": "0"
+
+  glance:
+    charm: cs:glance
+    series: *series
+    num_units: 3
+    bindings:
+      "": *network_space_default
+      public: *network_space_pub
+      admin: *network_space_os_mgmt
+      internal: *network_space_os_mgmt
+      amqp: *network_space_os_mgmt
+      cinder-volume-service: *network_space_os_mgmt
+      identity-service: *network_space_os_mgmt
+      image-service: *network_space_os_mgmt
+      ceph: *network_space_os_mgmt
+      storage-backend: *network_space_os_mgmt
+      shared-db: *network_space_os_mgmt
+      cluster: *network_space_os_mgmt
+    options:
+      region: *region
+      nagios_context: *nagios_context
+      vip: *vip_glance
+      openstack-origin: *openstack_origin
+      action-managed-upgrade: True
+      debug: 'False'
+      verbose: 'False'
+      region: *region
+      nagios_servicegroups: ceph,object,storage
+      use-internal-endpoints: True
+      use-syslog: True
+      restrict-ceph-pools: True
+    to:
+      - 'lxd:2'
+      - 'lxd:1'
+    annotations:
+      gui-x: '1000'
+      gui-y: '400'
+
+  memcached:
+    charm: cs:memcached
+    series: *series
+    num_units: 3
+    bindings:
+      "": *network_space_default
+      cache: *network_space_os_mgmt
+      cluster: *network_space_os_mgmt
+    options:
+      nagios_context: *nagios_context
+      action-managed-upgrade: True
+      allow-ufw-ip6-softfail: True
+    to:
+      - 'lxd:1'
+      - 'lxd:2'
+    annotations:
+      gui-x: '100'
+      gui-y: '800'
+
+  neutron-gateway:
+    charm: cs:neutron-gateway
+    series: *series
+    num_units: 1
+    bindings:
+      "": *network_space_default
+      data: *network_space_os_data
+      amqp: *network_space_os_mgmt
+      quantum-network-service: *network_space_os_mgmt
+      neutron-plugin-api: *network_space_os_mgmt
+      cluster: *network_space_os_mgmt
+    options:
+      nagios_context: *nagios_context
+      os-data-network: *os_data_network
+      openstack-origin: *openstack_origin
+      action-managed-upgrade: True
+      bridge-mappings: *bridge_mappings
+      data-port: *data_port
+      # Lower instance MTU to fit GRE tunnel (without changing switch config etc)
+      instance-mtu: *instance_mtu
+      nagios_servicegroups: neutron
+    to:
+      - '0'
+    annotations:
+      gui-x: '0'
+      gui-y: '1100'
+
+  ceilometer:
+    charm: cs:ceilometer
+    series: xenial
+    num_units: 1
+    bindings:
+      public: *network_space_pub
+      admin: *network_space_os_mgmt
+      internal: *network_space_os_mgmt
+    options:
+      region: *region
+      action-managed-upgrade: True
+      debug: False
+      verbose: False
+      event-time-to-live: *celiometer_event_time_to_live
+      metering-time-to-live: *celiometer_metering_time_to_live
+      region: *region
+    to:
+      - 'lxd:1'
+    annotations:
+      gui-x: '450'
+      gui-y: '-250'
+
+  ceilometer-agent:
+    charm: cs:ceilometer-agent
+    series: xenial
+    options:
+      action-managed-upgrade: True
+    annotations:
+      gui-x: '200'
+      gui-y: '-150'
+
+# ------------------------------------------------------------------------------
+relations:
+  - [ ntp, controller ]
+  - [ ntp, compute-host ]
+  - [ ntp, network-host ]
+  - [ percona-cluster, percona-hacluster ]
+  - [ cinder, cinder-hacluster ]
+  - [ glance, glance-hacluster ]
+  - [ keystone, keystone-hacluster ]
+  - [ neutron-api, neutron-api-hacluster ]
+  - [ nova-cloud-controller, controller-hacluster ]
+  - [ openstack-dashboard, horizon-hacluster ]
+  - [ keystone, percona-cluster ]
+  - [ neutron-api, percona-cluster ]
+  - [ neutron-api, rabbitmq-server ]
+  - [ neutron-api, nova-cloud-controller ]
+  - [ neutron-api, keystone ]
+  - [ neutron-openvswitch, rabbitmq-server ]
+  - [ neutron-openvswitch, neutron-api ]
+  - [ neutron-openvswitch, nova-compute ]
+  - [ nova-cloud-controller, memcached ]
+  - [ nova-cloud-controller, percona-cluster ]
+  - [ nova-cloud-controller, rabbitmq-server ]
+  - [ nova-cloud-controller, glance ]
+  - [ nova-cloud-controller, keystone ]
+  - [ nova-compute, nova-cloud-controller ]
+  - [ "nova-compute:amqp", "rabbitmq-server:amqp" ]
+  - [ nova-compute, glance ]
+  - [ nova-compute, percona-cluster ]
+  - [ glance, percona-cluster ]
+  - [ glance, keystone ]
+  - [ "glance:image-service", "cinder:image-service" ]
+  - [ "glance:amqp", "rabbitmq-server:amqp" ]
+  - [ cinder, percona-cluster ]
+  - [ cinder, rabbitmq-server ]
+  - [ cinder, nova-cloud-controller ]
+  - [ cinder, keystone ]
+  - [ openstack-dashboard, keystone ]
+  - [ "neutron-gateway:amqp", "rabbitmq-server:amqp" ]
+  - [ "neutron-gateway:neutron-plugin-api", "neutron-api:neutron-plugin-api" ]
+  - [ "nova-cloud-controller:quantum-network-service", "neutron-gateway:quantum-network-service" ]
+  - [ "ceph-proxy:client", "nova-compute:ceph" ]
+  - [ "ceph-proxy:client", "cinder-ceph:ceph" ]
+  - [ "cinder-ceph:storage-backend", "cinder:storage-backend" ]
+  - [ "ceph-proxy:client", "glance:ceph" ]
+# ceph-radosgw
+  - [ "ceph-radosgw:ha", "ceph-radosgw-hacluster:ha" ]
+  - [ "keystone:identity-service", "ceph-radosgw:identity-service" ]
+  - [ "ceph-radosgw:mon", "ceph-proxy:radosgw" ]
+  - [ "ceph-radosgw:juju-info", "defaultgw:juju-info" ]
+# default-gw
+  - [ "keystone:juju-info", "defaultgw:juju-info" ]
+  - [ "openstack-dashboard:juju-info", "defaultgw:juju-info" ]
+  - [ "nova-cloud-controller:juju-info", "defaultgw:juju-info" ]
+  - [ "glance:juju-info", "defaultgw:juju-info" ]
+  - [ "cinder:juju-info", "defaultgw:juju-info" ]
+  - [ "neutron-api:juju-info", "defaultgw:juju-info" ]
+# nagios server
+  - [ "nagios-server:juju-info", "defaultgw:juju-info" ]
+# nagios controllers (physical)
+  - [controller, nrpe-controller]
+  - [ "nrpe-controller:monitors", "nagios-server:monitors" ]
+# nagios ceph
+  - [ cinder, nrpe-cinder]
+  - [ cinder-hacluster, nrpe-cinder]
+  - [ "nrpe-cinder:monitors", "nagios-server:monitors" ]
+  - [ glance, nrpe-glance]
+  - [ glance-hacluster, nrpe-glance]
+  - [ "nrpe-glance:monitors", "nagios-server:monitors" ]
+  - [ ceph-radosgw, nrpe-radosgw]
+  - [ ceph-radosgw-hacluster, nrpe-radosgw]
+  - [ "nrpe-radosgw:monitors", "nagios-server:monitors" ]
+# nagios keystone
+  - [ keystone, nrpe-keystone]
+  - [ keystone-hacluster, nrpe-keystone]
+  - [ "nrpe-keystone:monitors", "nagios-server:monitors" ]
+# nagios horizon
+  - [ openstack-dashboard, nrpe-dashboard]
+  - [ horizon-hacluster, nrpe-dashboard]
+  - [ "nrpe-dashboard:monitors", "nagios-server:monitors" ]
+# nagios neutron
+  - [ neutron-api, nrpe-neutron]
+  - [ neutron-api-hacluster, nrpe-neutron]
+  - [ "nrpe-neutron:monitors", "nagios-server:monitors" ]
+  - [ network-host, nrpe-neutrongw]
+  - [ neutron-gateway, nrpe-neutrongw]
+  - [ "nrpe-neutrongw:monitors", "nagios-server:monitors" ]
+# nagios nova
+  - [ nova-cloud-controller, nrpe-nova]
+  - [ controller-hacluster, nrpe-nova]
+  - [ "nrpe-nova:monitors", "nagios-server:monitors" ]
+  - [ compute-host, nrpe-novacompute]
+  - [ nova-compute, nrpe-novacompute]
+  - [ "nrpe-novacompute:monitors", "nagios-server:monitors" ]
+# nagios percona
+  - [ percona-cluster, nrpe-percona]
+  - [ percona-hacluster, nrpe-percona]
+  - [ "nrpe-percona:monitors", "nagios-server:monitors" ]
+# nagios memcache
+  - [ "memcached:nrpe-external-master", "nrpe-memcache:nrpe-external-master" ]
+  - [ "nrpe-memcache:monitors", "nagios-server:monitors" ]
+# nagios rabbitmq
+  - [rabbitmq-server, nrpe-rabbitmq]
+  - [ "nrpe-rabbitmq:monitors", "nagios-server:monitors" ]
+# ceilometer
+  - [ "ceilometer:amqp", "rabbitmq-server:amqp" ]
+  - [ "ceilometer:identity-service", "keystone:identity-service" ]
+  - [ "ceilometer:identity-notifications", "keystone:identity-notifications" ]
+  - [ "ceilometer-agent:nova-ceilometer", "nova-compute:nova-ceilometer" ]
+  - [ "ceilometer:ceilometer-service", "ceilometer-agent:ceilometer-service" ]
+  - [ "ceilometer:juju-info", "defaultgw:juju-info" ]
+
+