diff --git a/bundles/openstack/bundle_template.juju2.0.cephlocal.yaml b/bundles/openstack/bundle_template.juju2.0.cephlocal.yaml
deleted file mode 100644
index a56a55d18447828c201ad337a3cab4feace5da85..0000000000000000000000000000000000000000
--- a/bundles/openstack/bundle_template.juju2.0.cephlocal.yaml
+++ /dev/null
@@ -1,489 +0,0 @@
-machines:
-  '0':
-    constraints: arch=amd64 tags=STRSITE-neutron-gw
-    series: xenial
-  '1':
-    constraints: arch=amd64 tags=STRSITE-controller
-    series: xenial
-  '2':
-    constraints: arch=amd64 tags=STRSITE-controller
-    series: xenial
-  '3':
-    constraints: arch=amd64 tags=STRSITE-controller
-    series: xenial
-  '4':
-    constraints: arch=amd64 tags=STRSITE-compute
-    series: xenial
-  '5':
-    constraints: arch=amd64 tags=STRSITE-compute
-    series: xenial
-
-services:
-  STRSITE-ctrl:
-    charm: cs:xenial/ubuntu
-    num_units: 3
-    to:
-      - '1'
-      - '2'
-      - '3'
-    annotations:
-      gui-x: '2000'
-      gui-y: '200'
-  STRSITE-compute:
-    charm: cs:xenial/ubuntu
-    num_units: 2
-    to:
-      - '4'
-      - '5'
-    annotations:
-      gui-x: '2000'
-      gui-y: '500'
-  STRSITE-gw:
-    charm: cs:xenial/ubuntu
-    num_units: 1
-    to:
-      - '0'
-    annotations:
-      gui-x: '2000'
-      gui-y: '800'
-  ntp-STRSITE:
-    charm: cs:xenial/ntp
-    options: 
-        source: 10.200.3.37
-    annotations:
-      gui-x: '2200'
-      gui-y: '500'
-
-#
-#  Please remember to change corosync_keys, running (on your prefered machine):
-#  	  corosync-keygen ; cat /etc/corosync/authkey | base64 -w 0 ; echo " "
-#
-  pxc-hacluster-STRSITE:
-    charm: cs:xenial/hacluster
-    bindings:
-      hanode: space-os-mgmt
-    options:
-      corosync_transport: 'unicast'
-      corosync_key: |
-        'd7684da259db27fa06398f57098ceb9ad406074368c2841eb799965225c612c656685c668e20af5a8fb257906b6180a28df0352e945fb31d69f1175470187e9a'
-  keystone-hacluster-STRSITE:
-    charm: cs:xenial/hacluster
-    bindings:
-      hanode: space-os-mgmt
-    options:
-      corosync_transport: 'unicast'
-      corosync_key: |
-        'b7289126a649484c7de3e0d7c27dbffd177c2573bedd3b73598ccb16b4e770a78f2333f851d7cc4b16dd31cc1101c8f1036d686a52ce4681d42eaaa58d1daefd'
-  horizon-hacluster-STRSITE:
-    charm: cs:xenial/hacluster
-    bindings:
-      hanode: space-os-mgmt
-    options:
-      corosync_transport: 'unicast'
-      corosync_key: |
-        '2d8f097fc0fbc53feab67974603aeede02c534b34f6f3e0a1b266a09dfff79d332e6ac8b15c83562eb6464e8b73c87014db07dc30a305b294a624077b2d2a69a'
-  controller-hacluster-STRSITE:
-    charm: cs:xenial/hacluster
-    bindings:
-      hanode: space-os-mgmt
-    options:
-      corosync_transport: 'unicast'
-      corosync_key: |
-        '8f2ed5f38e6cc306c954003f644a1fdee1bd7a9fb04ebe23c6f00f759c670207f77eefd95ea413f97ed4f3a31c81c29e45d664962cd9cd02e6176cdda02ea880'
-  neutron-api-hacluster-STRSITE:
-    charm: cs:xenial/hacluster
-    bindings:
-      hanode: space-os-mgmt
-    options:
-      corosync_transport: 'unicast'
-      corosync_key: |
-        '8f2ed5f38e6cc306c954003f644a1fdee1bd7a9fb04ebe23c6f00f759c670207f77eefd95ea413f97ed4f3a31c81c29e45d664962cd9cd02e6176cdda02ea880'
-  cinder-hacluster-STRSITE:
-    charm: cs:xenial/hacluster
-    bindings:
-      hanode: space-os-mgmt
-    options:
-      corosync_transport: 'unicast'
-      corosync_key: |
-        '82fa3f9b78fb0070f89441d258f24fd2db7920852618828297260499133d0e8d6893a0107b3111c98878c085d15284f88ba22c953e339593dd66a9096e839a6c'
-  glance-hacluster-STRSITE:
-    charm: cs:xenial/hacluster
-    bindings:
-      hanode: space-os-mgmt
-    options:
-      corosync_transport: 'unicast'
-      corosync_key: |
-        '0507a174c8ea488ec47740bc51a80b3dfaac8e3192c77feba062027a272a0b169f0e0a917d0128159db6a8c79f6bc7b1c25652e61108f05b3fa63bbcebeb9c54'
-
-  ceph-mon-STRSITE:
-    charm: cs:xenial/ceph-mon
-    num_units: 3 
-    bindings:
-      client: space-os-mgmt
-      cluster: space-os-mgmt
-      mon: space-os-mgmt
-      osd: space-os-mgmt
-    to:
-      - 'lxd:1'
-      - 'lxd:2'
-      - 'lxd:3'
-    annotations:
-      gui-x: '1200'
-      gui-y: '400'
-  ceph-osd-STRSITE:
-    charm: cs:xenial/ceph-osd
-    num_units: 2
-    bindings:
-      public: space-os-mgmt
-      cluster: space-os-data
-      mon: space-os-mgmt
-    options:
-      osd-devices: /data
-      osd-reformat: 'True'
-      osd-format: 'xfs'
-      use-syslog: True
-    to:
-      - '4'
-      - '5'
-    annotations:
-      gui-x: '1400'
-      gui-y: '400'
-  rabbitmq-server-STRSITE:
-    charm: cs:xenial/rabbitmq-server
-    num_units: 3
-    bindings:
-      amqp: space-os-mgmt
-    options:
-      management_plugin: True
-      use-syslog: 'True'
-      min-cluster-size: 3
-    to:
-      - 'lxd:1'
-      - 'lxd:2'
-      - 'lxd:3'
-    annotations:
-      gui-x: '800'
-      gui-y: '800'
-  percona-cluster-STRSITE:
-    charm: cs:xenial/percona-cluster
-    num_units: 3
-    bindings:
-      shared-db: space-os-mgmt
-      cluster: space-os-mgmt
-    options:
-      innodb-buffer-pool-size: 10%
-      vip: STRVIPPREFIX7
-      root-password: STRperconaPass
-      sst-password: STRperconaPass!
-      max-connections: 10000
-      min-cluster-size: 3
-      lp1366997-workaround: True
-    to:
-      - 'lxd:1'
-      - 'lxd:2'
-      - 'lxd:3'
-    annotations:
-      gui-x: '200'
-      gui-y: '800'
-  keystone-STRSITE:
-    charm: cs:xenial/keystone
-    num_units: 3
-    bindings:
-      public: space-os-mgmt
-      admin: space-os-mgmt
-      internal: space-os-mgmt
-      shared-db: space-os-mgmt
-      cluster: space-os-mgmt
-    options:
-      preferred-api-version: 3
-      debug: 'True'
-      verbose: 'True'
-      admin-password: STRadminPassDash
-      admin-token: 'cfNq7tbZ5KLstMwqhWcrp7sbF8Fz3qZ33zPj5BTdMKBm6F4GqycJ7kWj796BYcHh'
-      admin-user: admin
-      vip: STRVIPPREFIX1
-      use-syslog: True
-    to:
-      - 'lxd:1'
-      - 'lxd:2'
-      - 'lxd:3'
-    annotations:
-      gui-x: '500'
-      gui-y: '500'
-  openstack-dashboard-STRSITE:
-    charm: cs:xenial/openstack-dashboard
-    num_units: 3
-    bindings:
-      website: space-os-mgmt
-      shared-db: space-os-mgmt
-      cluster: space-os-mgmt
-    options:
-      debug: 'no'
-      use-syslog: True
-      webroot: '/'
-      vip: STRVIPPREFIX2
-      secret: 7432jfsh4w9fwehkwt47ihsgfj4wgkh749js4gt
-    to:
-      - 'lxd:1'
-      - 'lxd:2'
-      - 'lxd:3'
-    annotations:
-      gui-x: '500'
-      gui-y: '0'
-  nova-compute-STRSITE:
-    charm: cs:xenial/nova-compute
-    num_units: 2
-    bindings:
-      amqp: space-os-mgmt
-      cloud-compute: space-os-mgmt
-      image-service: space-os-mgmt
-      ceph: space-os-mgmt
-#      lxd: ###
-#      nova-ceilometer: ###
-      neutron-plugin: space-os-mgmt
-      compute-peer: space-os-mgmt
-    options:
-      debug: True
-      verbose: True
-      enable-live-migration: False
-      enable-resize: False
-      migration-auth-type: none
-    to:
-      - '4'
-      - '5'
-    annotations:
-      gui-x: '0'
-      gui-y: '200'
-  nova-cloud-controller-STRSITE:
-    charm: cs:xenial/nova-cloud-controller
-    num_units: 3
-    bindings:
-      public: space-os-mgmt
-      admin: space-os-mgmt
-      internal: space-os-mgmt
-      amqp: space-os-mgmt
-      cinder-volume-service: space-os-mgmt
-      identity-service: space-os-mgmt
-      image-service: space-os-mgmt
-      quantum-network-service: space-os-mgmt
-      cloud-compute: space-os-mgmt
-      neutron-api: space-os-mgmt
-#      cell: ###
-      memcache: space-os-mgmt
-      shared-db: space-os-mgmt
-      cluster: space-os-mgmt
-    options:
-      debug: True
-      verbose: True
-      network-manager: Neutron
-      console-access-protocol: 'vnc'
-      console-proxy-ip: 'local'
-      vip: STRVIPPREFIX3
-      service-guard: 'True'
-      single-nova-consoleauth: False
-    to:
-      - 'lxd:1'
-      - 'lxd:2'
-      - 'lxd:3'
-    annotations:
-      gui-x: '0'
-      gui-y: '500'
-  neutron-api-STRSITE:
-    charm: cs:xenial/neutron-api
-    num_units: 3
-    bindings:
-      public: space-os-mgmt
-      admin: space-os-mgmt
-      internal: space-os-mgmt
-      amqp: space-os-mgmt
-      identity-service: space-os-mgmt
-      neutron-api: space-os-mgmt
-      neutron-plugin-api: space-os-mgmt
-      shared-db: space-os-mgmt
-      cluster: space-os-mgmt
-    options:
-      debug: True
-      verbose: True
-      use-syslog: True
-      neutron-external-network: ext_net
-      network-device-mtu: 1500
-      neutron-security-groups: True
-      flat-network-providers: ext_net
-      vip: STRVIPPREFIX4
-    to:
-      - 'lxd:1'
-      - 'lxd:2'
-      - 'lxd:3'
-    annotations:
-      gui-x: '500'
-      gui-y: '1100'
-  neutron-openvswitch-STRSITE:
-    charm: cs:xenial/neutron-openvswitch
-    bindings:
-      amqp: space-os-mgmt
-      data: space-os-data
-      neutron-plugin: space-os-mgmt
-      neutron-plugin-api: space-os-mgmt
-    options:
-      use-syslog: True
-      debug: True
-      verbose: True
-      disable-security-groups: False
-      os-data-network: STRDATANET
-      flat-network-providers: ext_net
-    annotations:
-      gui-x: '1100'
-      gui-y: '1100'
-  cinder-STRSITE:
-    num_units: 3
-    charm: cs:xenial/cinder
-    bindings:
-      public: space-os-mgmt
-      admin: space-os-mgmt
-      internal: space-os-mgmt
-      amqp: space-os-mgmt
-      cinder-volume-service: space-os-mgmt
-      identity-service: space-os-mgmt
-      image-service: space-os-mgmt
-      ceph: space-os-mgmt
-      storage-backend: space-os-mgmt
-      shared-db: space-os-mgmt
-      cluster: space-os-mgmt
-    options:
-      glance-api-version: 2    
-      use-syslog: True
-      block-device: None
-      vip: STRVIPPREFIX5
-    to:
-      - 'lxd:1'
-      - 'lxd:2'
-      - 'lxd:3'
-    annotations:
-      gui-x: '1000'
-      gui-y: '200'
-  cinder-ceph-STRSITE:
-    charm: cs:xenial/cinder-ceph
-    num_units: 0
-    bindings:
-      ceph: space-os-mgmt
-    annotations:
-      gui-x: '1250'
-      gui-y: '250'
-  glance-STRSITE:
-    num_units: 3
-    charm: cs:xenial/glance
-    bindings:
-      public: space-os-mgmt
-      admin: space-os-mgmt
-      internal: space-os-mgmt
-      amqp: space-os-mgmt
-      cinder-volume-service: space-os-mgmt
-      identity-service: space-os-mgmt
-      image-service: space-os-mgmt
-      ceph: space-os-mgmt
-      storage-backend: space-os-mgmt
-      shared-db: space-os-mgmt
-      cluster: space-os-mgmt
-    options:
-      use-syslog: True
-      debug: True
-      verbose: True
-      vip: STRVIPPREFIX6
-    to:
-      - 'lxd:1'
-      - 'lxd:2'
-      - 'lxd:3'
-    annotations:
-      gui-x: '1000'
-      gui-y: '400'
-  memcached-STRSITE:
-    num_units: 3
-    charm: cs:xenial/memcached
-    bindings:
-      cache: space-os-mgmt
-      cluster: space-os-mgmt
-    options:
-        allow-ufw-ip6-softfail: True
-    to:
-      - 'lxd:1'
-      - 'lxd:2'
-      - 'lxd:3'
-  neutron-gateway-STRSITE:
-      charm: cs:xenial/neutron-gateway
-      num_units: 1
-      bindings:
-        data: space-os-data
-        amqp: space-os-mgmt
-        quantum-network-service: space-os-mgmt
-        neutron-plugin-api: space-os-mgmt
-        cluster: space-os-mgmt
-      options:
-        bridge-mappings: ext_net:br-ex
-        data-port: br-ex:bond0.401
-        os-data-network: STRDATANET
- #      Lower instance MTU to fit GRE tunnel (without changing switch config etc) 
-        instance-mtu: 1400
-      to:
-        - '0'
-      annotations:
-        gui-x: '0'
-        gui-y: '1100'
-overrides:
-  openstack-origin: cloud:xenial-mitaka
-  cluster_count: 3
-  use-syslog: True
-relations:
-  - [ ntp-STRSITE, STRSITE-ctrl ]
-  - [ ntp-STRSITE, STRSITE-compute ]
-  - [ ntp-STRSITE, STRSITE-gw ]
-  - [ percona-cluster-STRSITE, pxc-hacluster-STRSITE ]
-  - [ cinder-STRSITE, cinder-hacluster-STRSITE ]
-  - [ glance-STRSITE, glance-hacluster-STRSITE ]
-  - [ keystone-STRSITE, keystone-hacluster-STRSITE ]
-  - [ neutron-api-STRSITE, neutron-api-hacluster-STRSITE ]
-  - [ nova-cloud-controller-STRSITE, controller-hacluster-STRSITE ]
-  - [ openstack-dashboard-STRSITE, horizon-hacluster-STRSITE ]
-  - [ keystone-STRSITE, percona-cluster-STRSITE ]
-  - [ neutron-api-STRSITE, percona-cluster-STRSITE ]
-  - [ neutron-api-STRSITE, rabbitmq-server-STRSITE ]
-  - [ neutron-api-STRSITE, nova-cloud-controller-STRSITE ]
-  - [ neutron-api-STRSITE, keystone-STRSITE ]
-  - [ neutron-openvswitch-STRSITE, rabbitmq-server-STRSITE ]
-  - [ neutron-openvswitch-STRSITE, neutron-api-STRSITE ]
-  - [ neutron-openvswitch-STRSITE, nova-compute-STRSITE ]
-  - [ nova-cloud-controller-STRSITE, memcached-STRSITE ]
-  - [ nova-cloud-controller-STRSITE, percona-cluster-STRSITE ]
-  - [ nova-cloud-controller-STRSITE, rabbitmq-server-STRSITE ]
-  - [ nova-cloud-controller-STRSITE, glance-STRSITE ]
-  - [ nova-cloud-controller-STRSITE, keystone-STRSITE ]
-  - [ nova-compute-STRSITE, nova-cloud-controller-STRSITE ]
-  - - nova-compute-STRSITE:amqp
-    - rabbitmq-server-STRSITE:amqp
-  - [ nova-compute-STRSITE, glance-STRSITE ]
-  - [ glance-STRSITE, percona-cluster-STRSITE ]
-  - [ glance-STRSITE, keystone-STRSITE ]
-  - - glance-STRSITE:image-service
-    - cinder-STRSITE:image-service
-  - - glance-STRSITE:amqp
-    - rabbitmq-server-STRSITE:amqp
-  - [ cinder-STRSITE, percona-cluster-STRSITE ]
-  - [ cinder-STRSITE, rabbitmq-server-STRSITE ]
-  - [ cinder-STRSITE, nova-cloud-controller-STRSITE ]
-  - [ cinder-STRSITE, keystone-STRSITE ]
-  - [ openstack-dashboard-STRSITE, keystone-STRSITE ]
-  - - neutron-gateway-STRSITE:amqp
-    - rabbitmq-server-STRSITE:amqp
-  - - neutron-gateway-STRSITE:neutron-plugin-api
-    - neutron-api-STRSITE:neutron-plugin-api
-  - - nova-cloud-controller-STRSITE:quantum-network-service
-    - neutron-gateway-STRSITE:quantum-network-service
-  - - ceph-mon-STRSITE:client
-    - nova-compute-STRSITE:ceph
-  - - ceph-mon-STRSITE:client
-    - cinder-ceph-STRSITE:ceph
-  - - cinder-ceph-STRSITE:storage-backend
-    - cinder-STRSITE:storage-backend
-  - - ceph-mon-STRSITE:client
-    - glance-STRSITE:ceph
-  - - ceph-osd-STRSITE:mon
-    - ceph-mon-STRSITE:osd
diff --git a/bundles/openstack/bundle_template.juju2.0.ctrl.yaml b/bundles/openstack/bundle_template.juju2.0.ctrl.yaml
deleted file mode 100644
index 27d9331f22165d0dff6271d4d3b9f6ea667c4efd..0000000000000000000000000000000000000000
--- a/bundles/openstack/bundle_template.juju2.0.ctrl.yaml
+++ /dev/null
@@ -1,511 +0,0 @@
-machines:
-  '0':
-    constraints: arch=amd64 tags=STRSITE-neutron-gw
-    series: xenial
-  '1':
-    constraints: arch=amd64 tags=STRSITE-controller
-    series: xenial
-  '2':
-    constraints: arch=amd64 tags=STRSITE-controller
-    series: xenial
-  '3':
-    constraints: arch=amd64 tags=STRSITE-controller-pub
-    series: xenial
-  '4':
-    constraints: arch=amd64 tags=STRSITE-controller-pub
-    series: xenial
-  '5':
-    constraints: arch=amd64 tags=STRSITE-compute
-    series: xenial
-  '6':
-    constraints: arch=amd64 tags=STRSITE-compute
-    series: xenial
-
-services:
-  STRSITE-ctrl:
-    charm: cs:xenial/ubuntu
-    num_units: 2
-    to:
-      - '1'
-      - '2'
-    annotations:
-      gui-x: '2000'
-      gui-y: '0'
-  STRSITE-ctrl-pub:
-    charm: cs:xenial/ubuntu
-    num_units: 2
-    to:
-      - '3'
-      - '4'
-    annotations:
-      gui-x: '2000'
-      gui-y: '200'
-  STRSITE-compute:
-    charm: cs:xenial/ubuntu
-    num_units: 2
-    to:
-      - '5'
-      - '6'
-    annotations:
-      gui-x: '2000'
-      gui-y: '500'
-  STRSITE-gw:
-    charm: cs:xenial/ubuntu
-    num_units: 1
-    to:
-      - '0'
-    annotations:
-      gui-x: '2000'
-      gui-y: '800'
-  ntp-STRSITE:
-    charm: cs:xenial/ntp
-    options: 
-        source: 10.200.3.38
-    annotations:
-      gui-x: '2200'
-      gui-y: '500'
-
-#
-#  Please remember to change corosync_keys, running (on your prefered machine):
-#  	  corosync-keygen ; cat /etc/corosync/authkey | base64 -w 0 ; echo " "
-#
-  pxc-hacluster-STRSITE:
-    charm: cs:xenial/hacluster
-    bindings:
-      hanode: space-os-mgmt
-    options:
-      corosync_transport: 'unicast'
-      corosync_key: |
-        'hyhtRLDQvRnL8llTGCRuccdh29/ae+EwN9a5yyqfJHFkbzZXPIGmC/NUPEnd8JlYsXTWCBZrMj7WQATVmp3XBiBmzUzyYp2c5o76CCvgcsRvqZm9+D4j1k3oz5bBzYcIN88/NoUK8+6OU3E7mzw4q7k4W8WK0vPYqDAi5T2tLyM='
-    annotations:
-      gui-x: '1300'
-      gui-y: '800'
-  keystone-hacluster-STRSITE:
-    charm: cs:xenial/hacluster
-    bindings:
-      hanode: space-os-mgmt
-    options:
-      corosync_transport: 'unicast'
-      corosync_key: |
-        'FLTUgxnHuEDnfgJyr/1OGW3V6U5uZh7oGszYNefGPxgM0cTAma1zPEAcJGhUVaBgw56h4Al7AYPt1GapYiAdhQdDkS9wu8MSeFGwuAgAprMHJJRwIcPu9wBIUJ71fQyCEn2e2UWCYt/Pm0UrZR/PfWR/QUWEWkXamWF5dN0UmR4='
-    annotations:
-      gui-x: '350'
-      gui-y: '350'
-  horizon-hacluster-STRSITE:
-    charm: cs:xenial/hacluster
-    bindings:
-      hanode: space-os-mgmt
-    options:
-      corosync_transport: 'unicast'
-      corosync_key: |
-        'ddoYSHWWfTlUb6GPNScQJR9myi5Nm46OVsMdiSYEpOy3cjjG6oJHxXAttBMUQP9f3mie6CmLTk24Ot37FsPuht/BuvlLWfIRUWI2lYAxaybb1T7ufuo5kKQzLiOkMcdKLApxucjXMFQ/MaKfkzbH9xGUN9+Du1Wc+F3ugH9PgZk='
-    annotations:
-      gui-x: '250'
-      gui-y: '50'
-  controller-hacluster-STRSITE:
-    charm: cs:xenial/hacluster
-    bindings:
-      hanode: space-os-mgmt
-    options:
-      corosync_transport: 'unicast'
-      corosync_key: |
-        '73tkWJKfHEp/L1sgHMmCdzblPxuUJQdKW4Zpln0CZUUaCXO0ddLmWaEzSMZLffJrHZmLfnFh816Kw8TFyqFo4G9MYxjZYCzgRUEp9ItkMJzUzBe3CLsbAlqT/58cq7HbvA9UBgRVrJt9sM/JSP8foA95cVGGI1YjURwWiCgqP9A='
-    annotations:
-      gui-x: '-200'
-      gui-y: '500'
-  neutron-api-hacluster-STRSITE:
-    charm: cs:xenial/hacluster
-    bindings:
-      hanode: space-os-mgmt
-    options:
-      corosync_transport: 'unicast'
-      corosync_key: |
-        'GJjwnd7RYhtnMrhyjd7vFtoXsSQ8C1B79+mL//5fH1X7Dl0rOizrZKseQmPg51wLalSgpDbQrnMTCRqyOBCHZrpcfJzynv1hyqhvllBe6/sEpCDaMS11mKrS3Al3mafInt0/4lor1sP8D9Fzy02cKrDeYi9iLUrqwtYcoCQQiN4='
-    annotations:
-      gui-x: '550'
-      gui-y: '1350'
-  cinder-hacluster-STRSITE:
-    charm: cs:xenial/hacluster
-    bindings:
-      hanode: space-os-mgmt
-    options:
-      corosync_transport: 'unicast'
-      corosync_key: |
-        'A4Tar5UdZ/vr67/TQI4Wexht4AKSeuiS2iZRrYYeZk7eXewyYjF8KvK1k3reBgThZv3kpvoYFNCunCizp+RMT6OJBvOzk475UpqjcTiCKkqoL/WdeLPnleFOLkpgS8jQ/JLV3MgVU4Es8rN1Q0mpOMN68l2A+Fuk+YrJ78pa9SI='
-    annotations:
-      gui-x: '1000'
-      gui-y: '0'
-  glance-hacluster-STRSITE:
-    charm: cs:xenial/hacluster
-    bindings:
-      hanode: space-os-mgmt
-    options:
-      corosync_transport: 'unicast'
-      corosync_key: |
-        'qOHrjGbWmhXE6qqml3THRWulD2OPFGngAJE//sXPWgIS+mwHHs09yg6vDFJJhe6/Bu2J8QPHzhfVEFbhaTmFzhzUfX+aehxT0rs1f/+NRPvsX2NjNmu2ZauNBx9XFILW2+YftRcuFtwJXn2HqE0rX0IswCSedKdpYMi/aXf1CLo='
-    annotations:
-      gui-x: '1200'
-      gui-y: '600'
-
-  rabbitmq-server-STRSITE:
-    charm: cs:xenial/rabbitmq-server
-    num_units: 3
-    bindings:
-      amqp: space-os-mgmt
-    options:
-      management_plugin: True
-      use-syslog: 'True'
-      min-cluster-size: 2
-    to:
-      - 'lxd:1'
-      - 'lxd:2'
-    annotations:
-      gui-x: '400'
-      gui-y: '800'
-  percona-cluster-STRSITE:
-    charm: cs:xenial/percona-cluster
-    num_units: 3
-    bindings:
-      shared-db: space-os-mgmt
-      cluster: space-os-mgmt
-    options:
-      innodb-buffer-pool-size: 5%
-      vip: STRVIPPREFIX7
-      root-password: STRperconaPass
-      sst-password: STRperconaPass!
-      max-connections: 30000
-      min-cluster-size: 3
-      lp1366997-workaround: True
-    to:
-      - 'lxd:2'
-      - 'lxd:1'
-    annotations:
-      gui-x: '1000'
-      gui-y: '800'
-  keystone-STRSITE:
-    charm: cs:xenial/keystone
-    num_units: 3
-    bindings:
-      public: space-pub
-      admin: space-os-mgmt
-      internal: space-os-mgmt
-      shared-db: space-os-mgmt
-      cluster: space-os-mgmt
-    options:
-      preferred-api-version: 3
-      debug: 'True'
-      verbose: 'True'
-      admin-password: STRadminPassDash
-      admin-token: 'cfNq7tbZ5KLstMwqhWcrp7sbF8Fz3qZ33zPj5BTdMKBm6F4GqycJ7kWj796BYcHh'
-      admin-user: admin
-      vip: STRVIPPREFIX1 STRPUBVIPPREFIX1
-      region: region-STRSITE
-      os-public-hostname: STRKSPUBNAME
-      use-syslog: True
-    to:
-      - 'lxd:3'
-      - 'lxd:4'
-    annotations:
-      gui-x: '500'
-      gui-y: '500'
-  openstack-dashboard-STRSITE:
-    charm: cs:xenial/openstack-dashboard
-    num_units: 3
-    bindings:
-      website: space-pub
-      shared-db: space-os-mgmt
-      cluster: space-os-mgmt
-    options:
-      debug: 'no'
-      use-syslog: True
-      webroot: '/'
-      vip: STRPUBVIPPREFIX2
-      secret: 7432jfsh4w9fwehkwt47ihsgfj4wgkh749js4gt
-    to:
-      - 'lxd:4'
-      - 'lxd:3'
-    annotations:
-      gui-x: '500'
-      gui-y: '0'
-  nova-compute-STRSITE:
-    charm: cs:xenial/nova-compute
-    num_units: 2
-    bindings:
-      amqp: space-os-mgmt
-      cloud-compute: space-os-mgmt
-      image-service: space-os-mgmt
-      ceph: space-os-mgmt
-#      lxd: ###
-#      nova-ceilometer: ###
-      neutron-plugin: space-os-mgmt
-      compute-peer: space-os-mgmt
-    options:
-      debug: True
-      verbose: True
-      enable-live-migration: False
-      enable-resize: False
-      migration-auth-type: none
-    to:
-      - '5'
-      - '6'
-    annotations:
-      gui-x: '0'
-      gui-y: '200'
-  nova-cloud-controller-STRSITE:
-    charm: cs:xenial/nova-cloud-controller
-    num_units: 3
-    bindings:
-      public: space-pub
-      admin: space-os-mgmt
-      internal: space-os-mgmt
-      amqp: space-os-mgmt
-      cinder-volume-service: space-os-mgmt
-      identity-service: space-os-mgmt
-      image-service: space-os-mgmt
-      quantum-network-service: space-os-mgmt
-      cloud-compute: space-os-mgmt
-      neutron-api: space-os-mgmt
-#      cell: ###
-      memcache: space-os-mgmt
-      shared-db: space-os-mgmt
-      cluster: space-os-mgmt
-    options:
-      debug: True
-      verbose: True
-      network-manager: Neutron
-      console-access-protocol: 'vnc'
-#        console-proxy-ip: 'local'
-########### Temporary: console is redirected to a public ip (maas host: 10.4.0.88) which is then natted to the private cloud controller
-      console-proxy-ip: STRPUBVIPPREFIX3
-      vip: STRVIPPREFIX3 STRPUBVIPPREFIX3
-      region: region-STRSITE
-      service-guard: 'True'
-      single-nova-consoleauth: False
-    to:
-      - 'lxd:3'
-      - 'lxd:4'
-    annotations:
-      gui-x: '0'
-      gui-y: '500'
-  neutron-api-STRSITE:
-    charm: cs:xenial/neutron-api
-    num_units: 3
-    bindings:
-      public: space-os-mgmt
-      admin: space-os-mgmt
-      internal: space-os-mgmt
-      amqp: space-os-mgmt
-      identity-service: space-os-mgmt
-      neutron-api: space-os-mgmt
-      neutron-plugin-api: space-os-mgmt
-      shared-db: space-os-mgmt
-      cluster: space-os-mgmt
-    options:
-      debug: True
-      verbose: True
-      use-syslog: True
-      neutron-external-network: ext_net
-      network-device-mtu: 1500
-      neutron-security-groups: True
-      flat-network-providers: ext_net
-      vip: STRVIPPREFIX4
-      region: region-STRSITE
-    to:
-      - 'lxd:4'
-      - 'lxd:3'
-    annotations:
-      gui-x: '500'
-      gui-y: '1100'
-  neutron-openvswitch-STRSITE:
-    charm: cs:xenial/neutron-openvswitch
-    bindings:
-      amqp: space-os-mgmt
-      data: space-os-data
-      neutron-plugin: space-os-mgmt
-      neutron-plugin-api: space-os-mgmt
-    options:
-      use-syslog: True
-      debug: True
-      verbose: True
-      disable-security-groups: False
-      os-data-network: STRDATANET
-      flat-network-providers: ext_net
-    annotations:
-      gui-x: '1100'
-      gui-y: '1100'
-  cinder-STRSITE:
-    num_units: 3
-    charm: cs:xenial/cinder
-    bindings:
-      public: space-os-mgmt
-      admin: space-os-mgmt
-      internal: space-os-mgmt
-      amqp: space-os-mgmt
-      cinder-volume-service: space-os-mgmt
-      identity-service: space-os-mgmt
-      image-service: space-os-mgmt
-      ceph: space-os-mgmt
-      storage-backend: space-os-mgmt
-      shared-db: space-os-mgmt
-      cluster: space-os-mgmt
-    options:
-      glance-api-version: 2    
-      use-syslog: True
-      block-device: None
-      vip: STRVIPPREFIX5
-      region: region-STRSITE
-    to:
-      - 'lxd:1'
-      - 'lxd:2'
-    annotations:
-      gui-x: '1000'
-      gui-y: '200'
-  ceph-proxy-STRSITE:
-    num_units: 1
-    charm: cs:xenial/ceph-proxy
-    bindings:
-#      public: ###
-      client: space-os-mgmt
-      radosgw: space-os-mgmt
-    options:
-# CT:
-      fsid: a5256fb9-3bba-4c19-bc1b-2e34fc132706
-      monitor-hosts: 10.3.3.21:6789,10.3.3.22:6789,10.3.3.23:6789
-      admin-key: AQDCtN5Wdn6uNRAA8fFCySBJLwo9Pz+hJZfAqA==
-# BA:
-#      fsid: a5256fb9-3bba-4c19-bc1b-2e34fc132706
-#      monitor-hosts: 10.4.3.21:6789,10.4.3.22:6789,10.4.3.23:6789
-#      admin-key: AQByG0dXsCgdDhAAS1vZFCDcPqCqRoIlRLlKBQ==
-    to:
-      - 'lxd:5'
-    annotations:
-      gui-x: '1300'
-      gui-y: '400'
-  cinder-ceph-STRSITE:
-    charm: cs:xenial/cinder-ceph
-    num_units: 0
-    bindings:
-      ceph: space-os-mgmt
-      storage-backend: space-os-mgmt
-    annotations:
-      gui-x: '1330'
-      gui-y: '230'
-  glance-STRSITE:
-    num_units: 3
-    charm: cs:xenial/glance
-    bindings:
-      public: space-os-mgmt
-      admin: space-os-mgmt
-      internal: space-os-mgmt
-      amqp: space-os-mgmt
-      cinder-volume-service: space-os-mgmt
-      identity-service: space-os-mgmt
-      image-service: space-os-mgmt
-      ceph: space-os-mgmt
-      storage-backend: space-os-mgmt
-      shared-db: space-os-mgmt
-      cluster: space-os-mgmt
-    options:
-      use-syslog: True
-      debug: True
-      verbose: True
-      vip: STRVIPPREFIX6
-      region: region-STRSITE
-    to:
-      - 'lxd:2'
-      - 'lxd:1'
-    annotations:
-      gui-x: '1000'
-      gui-y: '400'
-  memcached-STRSITE:
-    num_units: 3
-    charm: cs:xenial/memcached
-    bindings:
-      cache: space-os-mgmt
-      cluster: space-os-mgmt
-    options:
-      allow-ufw-ip6-softfail: True
-    to:
-      - 'lxd:1'
-      - 'lxd:2'
-    annotations:
-      gui-x: '100'
-      gui-y: '800'
-  neutron-gateway-STRSITE:
-      charm: cs:xenial/neutron-gateway
-      num_units: 1
-      bindings:
-        data: space-os-data
-        amqp: space-os-mgmt
-        quantum-network-service: space-os-mgmt
-        neutron-plugin-api: space-os-mgmt
-        cluster: space-os-mgmt
-      options:
-        bridge-mappings: ext_net:br-ex
-        data-port: br-ex:bond0.401
-        os-data-network: STRDATANET
-# 	  Lower instance MTU to fit GRE tunnel (without changing switch config etc) 
-        instance-mtu: 1400
-      to:
-       - '0'
-      annotations:
-        gui-x: '0'
-        gui-y: '1100'
-overrides:
-  openstack-origin: cloud:xenial-mitaka
-  cluster_count: 3
-  use-syslog: True
-relations:
-  - [ ntp-STRSITE, STRSITE-ctrl ]
-  - [ ntp-STRSITE, STRSITE-ctrl-pub ]
-  - [ ntp-STRSITE, STRSITE-compute ]
-  - [ ntp-STRSITE, STRSITE-gw ]
-  - [ percona-cluster-STRSITE, pxc-hacluster-STRSITE ]
-  - [ cinder-STRSITE, cinder-hacluster-STRSITE ]
-  - [ glance-STRSITE, glance-hacluster-STRSITE ]
-  - [ keystone-STRSITE, keystone-hacluster-STRSITE ]
-  - [ neutron-api-STRSITE, neutron-api-hacluster-STRSITE ]
-  - [ nova-cloud-controller-STRSITE, controller-hacluster-STRSITE ]
-  - [ openstack-dashboard-STRSITE, horizon-hacluster-STRSITE ]
-  - [ keystone-STRSITE, percona-cluster-STRSITE ]
-  - [ neutron-api-STRSITE, percona-cluster-STRSITE ]
-  - [ neutron-api-STRSITE, rabbitmq-server-STRSITE ]
-  - [ neutron-api-STRSITE, nova-cloud-controller-STRSITE ]
-  - [ neutron-api-STRSITE, keystone-STRSITE ]
-  - [ neutron-openvswitch-STRSITE, rabbitmq-server-STRSITE ]
-  - [ neutron-openvswitch-STRSITE, neutron-api-STRSITE ]
-  - [ neutron-openvswitch-STRSITE, nova-compute-STRSITE ]
-  - [ nova-cloud-controller-STRSITE, memcached-STRSITE ]
-  - [ nova-cloud-controller-STRSITE, percona-cluster-STRSITE ]
-  - [ nova-cloud-controller-STRSITE, rabbitmq-server-STRSITE ]
-  - [ nova-cloud-controller-STRSITE, glance-STRSITE ]
-  - [ nova-cloud-controller-STRSITE, keystone-STRSITE ]
-  - [ nova-compute-STRSITE, nova-cloud-controller-STRSITE ]
-  - - nova-compute-STRSITE:amqp
-    - rabbitmq-server-STRSITE:amqp
-  - [ nova-compute-STRSITE, glance-STRSITE ]
-  - [ glance-STRSITE, percona-cluster-STRSITE ]
-  - [ glance-STRSITE, keystone-STRSITE ]
-  - - glance-STRSITE:image-service
-    - cinder-STRSITE:image-service
-  - - glance-STRSITE:amqp
-    - rabbitmq-server-STRSITE:amqp
-  - [ cinder-STRSITE, percona-cluster-STRSITE ]
-  - [ cinder-STRSITE, rabbitmq-server-STRSITE ]
-  - [ cinder-STRSITE, nova-cloud-controller-STRSITE ]
-  - [ cinder-STRSITE, keystone-STRSITE ]
-  - [ openstack-dashboard-STRSITE, keystone-STRSITE ]
-  - - neutron-gateway-STRSITE:amqp
-    - rabbitmq-server-STRSITE:amqp
-  - - neutron-gateway-STRSITE:neutron-plugin-api
-    - neutron-api-STRSITE:neutron-plugin-api
-  - - nova-cloud-controller-STRSITE:quantum-network-service
-    - neutron-gateway-STRSITE:quantum-network-service
-  - - ceph-proxy-STRSITE:client
-    - nova-compute-STRSITE:ceph
-  - - ceph-proxy-STRSITE:client
-    - cinder-ceph-STRSITE:ceph
-  - - cinder-ceph-STRSITE:storage-backend
-    - cinder-STRSITE:storage-backend
-  - - ceph-proxy-STRSITE:client
-    - glance-STRSITE:ceph