Here is the bundle we use:

icehouse:
  overrides:
    openstack-origin: "cloud:trusty-icehouse"
    source: "distro"
  services:
#Global services
    keystone:
      charm: "cs:trusty/keystone-5"
      num_units: 1
      constraints: tags=physical
      options:
        "admin-password": "admin"
        "admin-token": "admin"
        region: "RegionOne RegionTwo"
      annotations:
        "gui-x": "3002.1097412109375"
        "gui-y": "-309.98150634765625"
    "openstack-dashboard":
      charm: "cs:trusty/openstack-dashboard-4"
      num_units: 1
      to: keystone=0
      options:
        webroot: "/"
      annotations:
        "gui-x": "2836.45166015625"
        "gui-y": "-820.0273513793945"
    keystone-db:
      charm: "cs:trusty/mysql-1"
      num_units: 1
      to: keystone=0
      options:
        "dataset-size": "20%"
      annotations:
        "gui-x": "3183.2689208984375"
        "gui-y": "-652.9305801391602"
    ntp:
      charm: "cs:trusty/ntp-4"
      num_units: 0
      annotations:
        "gui-x": "3002.5959215164185"
        "gui-y": "1778.590518951416"
#Region One services
    ceph-r1:
      charm: "cs:trusty/ceph-27"
      num_units: 4
      constraints: tags=physical
      options:
        fsid: "9e7aac42-4bf4-11e3-b4b7-5254006a039c"
        "monitor-secret": AQAAvoJSOAv/NRAAgvXP8d7iXN7lWYbvDZzm2Q==
        "osd-devices": "/srv"
        "osd-reformat": "yes"
      annotations:
        "gui-x": "2671.3488159179688"
        "gui-y": "711.6273803710938"
    "nova-compute-r1":
      charm: "cs:trusty/nova-compute-3"
      num_units: 4
      constraints: tags=physical
      to: [ceph-r1=0, ceph-r1=1, ceph-r1=2, ceph-r1=3]
      options:
        "flat-interface": eth0
      annotations:
        "gui-x": "1197.3057861328125"
        "gui-y": "-217.30869579315186"
    "neutron-gateway-r1":
      charm: "cs:trusty/quantum-gateway-3"
      num_units: 1
      constraints: tags=virtual
      options:
        ext-port: eth1
        instance-mtu: 1400
      annotations:
        "gui-x": "811.8193359375"
        "gui-y": "-96.09478092193604"
    "nova-cloud-controller-r1": 
      charm: "cs:trusty/nova-cloud-controller-41"
      num_units: 1
      to: neutron-gateway-r1=0
      options: 
        "network-manager": Neutron
        region: RegionOne
      annotations:
        "gui-x": "1890.60400390625"
        "gui-y": "-127.73160362243652"
    glance-r1: 
      charm: "cs:trusty/glance-3"
      num_units: 1
      to: neutron-gateway-r1=0
      options:
        region: RegionOne
      annotations:
        "gui-x": "1377.3679809570312"
        "gui-y": "1415.484359741211"
    cinder-r1: 
      charm: "cs:trusty/cinder-4"
      num_units: 1
      to: neutron-gateway-r1=0
      options: 
        "block-device": none
        "config-flags": "storage_availability_zone=storage-r1"
        region: RegionOne
      annotations:
        "gui-x": "1904.6063232421875"
        "gui-y": "1336.556037902832"
    "ceph-radosgw-r1":
      charm: "cs:trusty/ceph-radosgw-3"
      num_units: 1
      to: neutron-gateway-r1=0
      options:
        region: RegionOne
      annotations:
        "gui-x": "2803.124755859375"
        "gui-y": "405.5666809082031"
    cinder-ceph-r1:
      charm: "cs:trusty/cinder-ceph-1"
      num_units: 0
      annotations:
        "gui-x": "2289.9517211914062"
        "gui-y": "1253.8931884765625"
    rabbitmq-r1:
      charm: "cs:trusty/rabbitmq-server-4"
      num_units: 1
      to: neutron-gateway-r1=0
      annotations:
        "gui-x": "837.9329833984375"
        "gui-y": "645.5720825195312"
    mysql-r1:
      charm: "cs:trusty/mysql-1"
      num_units: 1
      to: neutron-gateway-r1=0
      options:
        "dataset-size": "20%"
      annotations:
        "gui-x": "1148.5400390625"
        "gui-y": "1083.7168579101562"
#Region Two services
    ceph-r2:
      charm: "cs:trusty/ceph-27"
      num_units: 4
      constraints: tags=physical
      options:
        fsid: "9e7aac42-4bf4-11e3-b4b7-5254006a039c"
        "monitor-secret": AQAAvoJSOAv/NRAAgvXP8d7iXN7lWYbvDZzm2Q==
        "osd-devices": "/srv"
        "osd-reformat": "yes"
      annotations:
        "gui-x": "3345.2711791992188"
        "gui-y": "747.267578125"
    "nova-compute-r2":
      charm: "cs:trusty/nova-compute-3"
      num_units: 4
      constraints: tags=physical
      to: [ceph-r2=0, ceph-r2=1, ceph-r2=2, ceph-r2=3]
      options:
        "flat-interface": eth0
      annotations:
        "gui-x": "4706.240539550781"
        "gui-y": "-239.9887990951538"
    "neutron-gateway-r2":
      charm: "cs:trusty/quantum-gateway-3"
      num_units: 1
      constraints: tags=virtual
      options:
        ext-port: eth1
        instance-mtu: 1400
      annotations:
        "gui-x": "5088.638214111328"
        "gui-y": "-70.17468452453613"
    "nova-cloud-controller-r2":
      charm: "cs:trusty/nova-cloud-controller-41"
      num_units: 1
      to: neutron-gateway-r2=0
      options:
        "network-manager": Neutron
        region: RegionTwo
      annotations:
        "gui-x": "4087.333251953125"
        "gui-y": "-147.17168164253235"
    glance-r2:
      charm: "cs:trusty/glance-3"
      num_units: 1
      to: neutron-gateway-r2=0
      options:
        region: RegionTwo
      annotations:
        "gui-x": "4857.142639160156"
        "gui-y": "1370.124252319336"
    cinder-r2:
      charm: "cs:trusty/cinder-4"
      num_units: 1
      to: neutron-gateway-r2=0
      options:
        region: RegionTwo
        "block-device": none
        "config-flags": "storage_availability_zone=storage-r2"
      annotations:
        "gui-x": "4448.0172119140625"
        "gui-y": "1436.996467590332"
    "ceph-radosgw-r2":
      charm: "cs:trusty/ceph-radosgw-3"
      num_units: 1
      to: neutron-gateway-r2=0
      options:
        region: RegionTwo
      annotations:
        "gui-x": "3178.965576171875"
        "gui-y": "412.0467529296875"
    cinder-ceph-r2:
      charm: "cs:trusty/cinder-ceph-1"
      num_units: 0
      annotations:
        "gui-x": "3861.3582153320312"
        "gui-y": "1260.373291015625"
    rabbitmq-r2:
      charm: "cs:trusty/rabbitmq-server-4"
      num_units: 1
      to: neutron-gateway-r2=0
      annotations:
        "gui-x": "5263.791687011719"
        "gui-y": "603.4519348144531"
    mysql-r2:
      charm: "cs:trusty/mysql-1"
      num_units: 1
      to: neutron-gateway-r2=0
      options:
        "dataset-size": "20%"
      annotations:
        "gui-x": "5117.557220458984"
        "gui-y": "1051.3165893554688"
  relations: 
#Global relations
    - - "keystone:shared-db"
      - "keystone-db:shared-db"
    - - "openstack-dashboard:identity-service"
      - "keystone:identity-service"
    - - "ntp:juju-info"
      - "keystone:juju-info"
#RegionOne
    - - "nova-cloud-controller-r1:shared-db"
      - "mysql-r1:shared-db"
    - - "nova-cloud-controller-r1:amqp"
      - "rabbitmq-r1:amqp"
    - - "nova-cloud-controller-r1:image-service"
      - "glance-r1:image-service"
    - - "nova-cloud-controller-r1:identity-service"
      - "keystone:identity-service"
    - - "glance-r1:shared-db"
      - "mysql-r1:shared-db"
    - - "glance-r1:identity-service"
      - "keystone:identity-service"
    - - "cinder-r1:shared-db"
      - "mysql-r1:shared-db"
    - - "cinder-r1:amqp"
      - "rabbitmq-r1:amqp"
    - - "cinder-r1:cinder-volume-service"
      - "nova-cloud-controller-r1:cinder-volume-service"
    - - "cinder-r1:identity-service"
      - "keystone:identity-service"
    - - "neutron-gateway-r1:shared-db"
      - "mysql-r1:shared-db"
    - - "neutron-gateway-r1:amqp"
      - "rabbitmq-r1:amqp"
    - - "neutron-gateway-r1:quantum-network-service"
      - "nova-cloud-controller-r1:quantum-network-service"
    - - "nova-compute-r1:shared-db"
      - "mysql-r1:shared-db"
    - - "nova-compute-r1:amqp"
      - "rabbitmq-r1:amqp"
    - - "nova-compute-r1:image-service"
      - "glance-r1:image-service"
    - - "nova-compute-r1:cloud-compute"
      - "nova-cloud-controller-r1:cloud-compute"
    - - "cinder-r1:storage-backend"
      - "cinder-ceph-r1:storage-backend"
    - - "ceph-r1:client"
      - "cinder-ceph-r1:ceph"
    - - "ceph-r1:client"
      - "nova-compute-r1:ceph"
    - - "ceph-r1:client"
      - "glance-r1:ceph"
    - - "ceph-radosgw-r1:mon"
      - "ceph-r1:radosgw"
    - - "ceph-radosgw-r1:identity-service"
      - "keystone:identity-service"
    - - "ntp:juju-info"
      - "neutron-gateway-r1:juju-info"
    - - "ntp:juju-info"
      - "ceph-r1:juju-info"
#RegionTwo
    - - "nova-cloud-controller-r2:shared-db"
      - "mysql-r2:shared-db"
    - - "nova-cloud-controller-r2:amqp"
      - "rabbitmq-r2:amqp"
    - - "nova-cloud-controller-r2:image-service"
      - "glance-r2:image-service"
    - - "nova-cloud-controller-r2:identity-service"
      - "keystone:identity-service"
    - - "glance-r2:shared-db"
      - "mysql-r2:shared-db"
    - - "glance-r2:identity-service"
      - "keystone:identity-service"
    - - "cinder-r2:shared-db"
      - "mysql-r2:shared-db"
    - - "cinder-r2:amqp"
      - "rabbitmq-r2:amqp"
    - - "cinder-r2:cinder-volume-service"
      - "nova-cloud-controller-r2:cinder-volume-service"
    - - "cinder-r2:identity-service"
      - "keystone:identity-service"
    - - "neutron-gateway-r2:shared-db"
      - "mysql-r2:shared-db"
    - - "neutron-gateway-r2:amqp"
      - "rabbitmq-r2:amqp"
    - - "neutron-gateway-r2:quantum-network-service"
      - "nova-cloud-controller-r2:quantum-network-service"
    - - "nova-compute-r2:shared-db"
      - "mysql-r2:shared-db"
    - - "nova-compute-r2:amqp"
      - "rabbitmq-r2:amqp"
    - - "nova-compute-r2:image-service"
      - "glance-r2:image-service"
    - - "nova-compute-r2:cloud-compute"
      - "nova-cloud-controller-r2:cloud-compute"
    - - "cinder-r2:storage-backend"
      - "cinder-ceph-r2:storage-backend"
    - - "ceph-r2:client"
      - "cinder-ceph-r2:ceph"
    - - "ceph-r2:client"
      - "nova-compute-r2:ceph"
    - - "ceph-r2:client"
      - "glance-r2:ceph"
    - - "ceph-radosgw-r2:mon"
      - "ceph-r2:radosgw"
    - - "ceph-radosgw-r2:identity-service"
      - "keystone:identity-service"
    - - "ntp:juju-info"
      - "neutron-gateway-r2:juju-info"
    - - "ntp:juju-info"
      - "ceph-r2:juju-info"
  series: trusty