Merge lp:~zulcss/openstack-charm-testing/lxd-refactor into lp:openstack-charm-testing

[Chuck Short]

LXD refactor.

[Ryan Beisner (1chb1n)]

review: Approve

=== removed file 'bundles/dev/nc-lxd-3host.yaml'
--- bundles/dev/nc-lxd-3host.yaml	2015-07-21 13:28:13 +0000
+++ bundles/dev/nc-lxd-3host.yaml	1970-01-01 00:00:00 +0000
@@ -1,199 +0,0 @@
-# An experimental bare metal bundle to test nc-lxd.  Recommend vivid-kilo
-# for lxd testing.  A three-machine smoosh.  Temporarily uses kilo-support
-# branches.
-#
-# NOTES(beisner) Feb 23, 2015:
-# /!\ Beware, YMMV. This might be crazy, ill-advised for production use.
-#     Ceph is excluded, as it would need 3 units for quorum.
-#
-# USAGE EXAMPLE:
-#    Ensure  default-series: vivid  is defined in environments.yaml.
-#    juju switch maas
-#    juju bootstrap --series=vivid --upload-tools --constraints arch=amd64
-#    juju-deployer -v -c <this_file>.yaml -d three-smoosh
-#=============================================================================
-three-smoosh:
-  series: vivid
-  services:
-    "juju-gui":
-      charm: "cs:trusty/juju-gui"
-      num_units: 1
-      annotations:
-        "gui-x": "500"
-        "gui-y": "1000"
-      to:
-        - "lxc:0"
-    keystone:
-      branch: lp:~openstack-charmers/charms/trusty/keystone/next
-      num_units: 1
-      options:
-        "admin-password": openstack
-      annotations:
-        "gui-x": "500"
-        "gui-y": "0"
-      to:
-        - "lxc:0"
-    neutron-gateway:
-      branch: lp:~openstack-charmers/charms/trusty/neutron-gateway/next
-      num_units: 1
-      options:
-        "ext-port": eth1
-      annotations:
-        "gui-x": "0"
-        "gui-y": "0"
-      to:
-        - "0"
-    neutron-api:
-      branch: lp:~openstack-charmers/charms/trusty/neutron-api/next
-      num_units: 1
-      options:
-        "neutron-security-groups": true
-      annotations:
-        "gui-x": "500"
-        "gui-y": "500"
-      to:
-        - "lxc:nova-compute=0"
-    neutron-openvswitch:
-      branch: lp:~openstack-charmers/charms/trusty/neutron-openvswitch/next
-      num_units: 0
-      annotations:
-        "gui-x": "250"
-        "gui-y": "500"
-    mysql:
-      branch: lp:~openstack-charmers/charms/trusty/percona-cluster/next
-      num_units: 1
-      options:
-        "max-connections": 20000
-      annotations:
-        "gui-x": "0"
-        "gui-y": "250"
-      to:
-        - "lxc:0"
-    nova-compute:
-      branch: lp:~zulcss/charms/trusty/nova-compute/nova-compute-lxd
-      num_units: 2
-      constraints: mem=8G
-      options:
-        openstack-origin: "ppa:zulcss/lxd-testing-vivid"
-        virt-type: lxd
-#        lxd-block-device: /mnt/disk.img|100G
-        lxd-block-device: /dev/sdb /dev/vdb
-        enable-live-migration: True
-        enable-resize: True
-        "enable-live-migration": true
-        "enable-resize": true
-        "migration-auth-type": ssh
-      annotations:
-        "gui-x": "250"
-        "gui-y": "250"
-    glance:
-      branch: lp:~openstack-charmers/charms/trusty/glance/next
-      num_units: 1
-      annotations:
-        "gui-x": "250"
-        "gui-y": "0"
-      to:
-        - "lxc:nova-compute=1"
-    nova-cloud-controller:
-      branch: lp:~openstack-charmers/charms/trusty/nova-cloud-controller/next
-      num_units: 1
-      options:
-        "network-manager": Neutron
-        "quantum-security-groups": "yes"
-      annotations:
-        "gui-x": "0"
-        "gui-y": "500"
-      to:
-        - "lxc:nova-compute=0"
-    openstack-dashboard:
-      branch: lp:~openstack-charmers/charms/trusty/openstack-dashboard/next
-      num_units: 1
-      annotations:
-        "gui-x": "500"
-        "gui-y": "-250"
-      to:
-        - "lxc:0"
-    rabbitmq-server:
-      branch: lp:~openstack-charmers/charms/trusty/rabbitmq-server/next
-      num_units: 1
-      annotations:
-        "gui-x": "500"
-        "gui-y": "250"
-      to:
-        - "lxc:0"
-    cinder:
-      branch: lp:~openstack-charmers/charms/trusty/cinder/next
-      num_units: 1
-      options:
-        "block-device": /dev/sdb /dev/vdb
-        "glance-api-version": 2
-      annotations:
-        "gui-x": "750"
-        "gui-y": "0"
-      to:
-        - "lxc:0"
-    ntp:
-      charm: "cs:trusty/ntp-6"
-      num_units: 0
-      annotations:
-        "gui-x": "1000"
-        "gui-y": "0"
-  relations:
-    - - "nova-compute:amqp"
-      - "rabbitmq-server:amqp"
-    - - "neutron-gateway:amqp"
-      - "rabbitmq-server:amqp"
-    - - "keystone:shared-db"
-      - "mysql:shared-db"
-    - - "nova-cloud-controller:identity-service"
-      - "keystone:identity-service"
-    - - "glance:identity-service"
-      - "keystone:identity-service"
-    - - "neutron-api:identity-service"
-      - "keystone:identity-service"
-    - - "neutron-openvswitch:neutron-plugin-api"
-      - "neutron-api:neutron-plugin-api"
-    - - "neutron-api:shared-db"
-      - "mysql:shared-db"
-    - - "neutron-api:amqp"
-      - "rabbitmq-server:amqp"
-    - - "neutron-gateway:neutron-plugin-api"
-      - "neutron-api:neutron-plugin-api"
-    - - "glance:shared-db"
-      - "mysql:shared-db"
-    - - "glance:amqp"
-      - "rabbitmq-server:amqp"
-    - - "nova-cloud-controller:image-service"
-      - "glance:image-service"
-    - - "nova-compute:image-service"
-      - "glance:image-service"
-    - - "nova-cloud-controller:cloud-compute"
-      - "nova-compute:cloud-compute"
-    - - "nova-cloud-controller:amqp"
-      - "rabbitmq-server:amqp"
-    - - "nova-cloud-controller:quantum-network-service"
-      - "neutron-gateway:quantum-network-service"
-    - - "nova-compute:neutron-plugin"
-      - "neutron-openvswitch:neutron-plugin"
-    - - "neutron-openvswitch:amqp"
-      - "rabbitmq-server:amqp"
-    - - "openstack-dashboard:identity-service"
-      - "keystone:identity-service"
-    - - "nova-cloud-controller:shared-db"
-      - "mysql:shared-db"
-    - - "nova-cloud-controller:neutron-api"
-      - "neutron-api:neutron-api"
-    - - "cinder:image-service"
-      - "glance:image-service"
-    - - "cinder:amqp"
-      - "rabbitmq-server:amqp"
-    - - "cinder:identity-service"
-      - "keystone:identity-service"
-    - - "cinder:cinder-volume-service"
-      - "nova-cloud-controller:cinder-volume-service"
-    - - "cinder:shared-db"
-      - "mysql:shared-db"
-    - - "ntp:juju-info"
-      - "nova-compute:juju-info"
-    - - "ntp:juju-info"
-      - "neutron-gateway:juju-info"

=== added directory 'bundles/lxd'
=== added file 'bundles/lxd/lxd.yaml'
--- bundles/lxd/lxd.yaml	1970-01-01 00:00:00 +0000
+++ bundles/lxd/lxd.yaml	2015-07-27 14:48:51 +0000
@@ -0,0 +1,310 @@
+# vim: set ts=2 et:
+# deployer bundle for development ('next') charms
+# UOSCI relies on this for OS-on-OS deployment testing
+openstack-services:
+  services:
+    mysql:
+      branch: lp:~openstack-charmers/charms/trusty/percona-cluster/next
+      constraints: mem=1G
+      options:
+        dataset-size: 50%
+    rabbitmq-server:
+      branch: lp:~openstack-charmers/charms/trusty/rabbitmq-server/next
+      constraints: mem=1G
+    ceph:
+      branch: lp:~openstack-charmers/charms/trusty/ceph/next
+      num_units: 3
+      constraints: mem=1G
+      options:
+        monitor-count: 3
+        fsid: 6547bd3e-1397-11e2-82e5-53567c8d32dc
+        monitor-secret: AQCXrnZQwI7KGBAAiPofmKEXKxu5bUzoYLVkbQ==
+        osd-devices: /dev/vdb
+        osd-reformat: "yes"
+        ephemeral-unmount: /mnt
+    keystone:
+      branch: lp:~openstack-charmers/charms/trusty/keystone/next
+      constraints: mem=1G
+      options:
+        admin-password: openstack
+        admin-token: ubuntutesting
+    openstack-dashboard:
+      branch: lp:~openstack-charmers/charms/trusty/openstack-dashboard/next
+      constraints: mem=1G
+    nova-compute:
+      branch: lp:~zulcss/charms/trusty/nova-compute/nova-compute-lxd
+      num_units: 3
+      constraints: mem=4G
+      options:
+        enable-live-migration: True
+        enable-resize: True
+        migration-auth-type: ssh
+        virt-type: lxd
+    nova-cloud-controller:
+      branch: lp:~openstack-charmers/charms/trusty/nova-cloud-controller/next
+      constraints: mem=1G
+      options:
+        network-manager: Neutron
+        quantum-security-groups: "yes"
+    neutron-gateway:
+      branch: lp:~openstack-charmers/charms/trusty/neutron-gateway/next
+      constraints: mem=1G
+      options:
+        instance-mtu: 1300
+    cinder:
+      branch: lp:~openstack-charmers/charms/trusty/cinder/next
+      options:
+        block-device: "None"
+        glance-api-version: 2
+      constraints: mem=1G
+    cinder-ceph:
+      branch: lp:~openstack-charmers/charms/trusty/cinder-ceph/next
+    glance:
+      branch: lp:~openstack-charmers/charms/trusty/glance/next
+      constraints: mem=1G
+    swift-proxy:
+      branch: lp:~openstack-charmers/charms/trusty/swift-proxy/next
+      constraints: mem=1G
+      options:
+        zone-assignment: manual
+        replicas: 3
+        swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae
+    swift-storage-z1:
+      branch: lp:~openstack-charmers/charms/trusty/swift-storage/next
+      constraints: mem=1G
+      options:
+        zone: 1
+        block-device: vdb
+        overwrite: "true"
+    swift-storage-z2:
+      branch: lp:~openstack-charmers/charms/trusty/swift-storage/next
+      constraints: mem=1G
+      options:
+        zone: 2
+        block-device: vdb
+        overwrite: "true"
+    swift-storage-z3:
+      branch: lp:~openstack-charmers/charms/trusty/swift-storage/next
+      constraints: mem=1G
+      options:
+        zone: 3
+        block-device: vdb
+        overwrite: "true"
+    ceilometer:
+      branch: lp:~openstack-charmers/charms/trusty/ceilometer/next
+      constraints: mem=1G
+    ceilometer-agent:
+      branch: lp:~openstack-charmers/charms/trusty/ceilometer-agent/next
+    heat:
+      branch: lp:~openstack-charmers/charms/trusty/heat/next
+    mongodb:
+      branch: lp:charms/trusty/mongodb
+      constraints: mem=1G
+    lxd:
+      branch: lp:~zulcss/+junk/lxd-container
+      options:
+        lxd-block-device: /mnt/disk.img|20G
+        lxd-origin: ppa:ubuntu-lxc/lxd-git-master
+        lxd-use-source: True
+        lxd-trust-password: blah
+  relations:
+    - [ keystone, mysql ]
+    - [ nova-cloud-controller, mysql ]
+    - [ nova-cloud-controller, rabbitmq-server ]
+    - [ nova-cloud-controller, glance ]
+    - [ nova-cloud-controller, keystone ]
+    - [ nova-compute, nova-cloud-controller ]
+    - [ nova-compute, lxd ]
+    - [ nova-compute, mysql ]
+    - - nova-compute
+      - rabbitmq-server:amqp
+    - [ nova-compute, glance ]
+    - [ nova-compute, ceph ]
+    - [ glance, mysql ]
+    - [ glance, keystone ]
+    - [ glance, ceph ]
+    - [ glance, cinder ]
+    - [ cinder, mysql ]
+    - [ cinder, rabbitmq-server ]
+    - [ cinder, nova-cloud-controller ]
+    - [ cinder, keystone ]
+    - [ cinder, cinder-ceph ]
+    - [ cinder-ceph, ceph ]
+    - [ neutron-gateway, mysql ]
+    - [ neutron-gateway, nova-cloud-controller ]
+    - [ openstack-dashboard, keystone ]
+    - [ swift-proxy, keystone ]
+    - [ swift-proxy, swift-storage-z1 ]
+    - [ swift-proxy, swift-storage-z2 ]
+    - [ swift-proxy, swift-storage-z3 ]
+    - - ceilometer
+      - keystone:identity-service
+    - [ ceilometer, rabbitmq-server ]
+    - [ ceilometer, mongodb ]
+    - [ ceilometer-agent, nova-compute ]
+    - [ ceilometer-agent, ceilometer ]
+    - [ heat, mysql ]
+    - [ heat, keystone ]
+    - [ heat, rabbitmq-server ]
+openstack-singlerabbit:
+  inherits: openstack-services
+  relations:
+    - [ "neutron-gateway:amqp", rabbitmq-server ]
+openstack-icehouse:
+  inherits: openstack-singlerabbit
+  services:
+    neutron-api:
+      branch: lp:~openstack-charmers/charms/trusty/neutron-api/next
+      constraints: mem=1G
+      options:
+        neutron-security-groups: True
+    neutron-openvswitch:
+      branch: lp:~openstack-charmers/charms/trusty/neutron-openvswitch/next
+  relations:
+  - [ neutron-api, mysql ]
+  - [ neutron-api, rabbitmq-server ]
+  - [ neutron-api, nova-cloud-controller ]
+  - [ neutron-api, neutron-openvswitch ]
+  - [ neutron-api, keystone ]
+  - [ neutron-api, neutron-gateway ]
+  - [ neutron-openvswitch, nova-compute ]
+  - [ neutron-openvswitch, rabbitmq-server ]
+openstack-icehouse-msg-split:
+  inherits: openstack-services
+  services:
+    neutron-api:
+      branch: lp:~openstack-charmers/charms/trusty/neutron-api/next
+      constraints: mem=1G
+      options:
+        neutron-security-groups: True
+    neutron-openvswitch:
+      branch: lp:~openstack-charmers/charms/trusty/neutron-openvswitch/next
+    rabbitmq-server-neutron:
+      branch: lp:charms/trusty/rabbitmq-server
+      constraints: mem=1G
+  relations:
+  - [ neutron-api, mysql ]
+  - [ neutron-api, rabbitmq-server-neutron ]
+  - [ neutron-api, nova-cloud-controller ]
+  - [ neutron-api, neutron-openvswitch ]
+  - [ neutron-api, keystone ]
+  - [ neutron-api, neutron-gateway ]
+  - [ neutron-openvswitch, nova-compute ]
+  - [ neutron-openvswitch, rabbitmq-server-neutron ]
+  - [ "neutron-gateway:amqp-nova", rabbitmq-server ]
+  - [ "neutron-gateway:amqp", rabbitmq-server-neutron ]
+# icehouse
+precise-icehouse:
+  inherits: openstack-singlerabbit
+  series: precise
+  overrides:
+    openstack-origin: cloud:precise-icehouse
+    source: cloud:precise-icehouse
+precise-icehouse-proposed:
+  inherits: precise-icehouse
+  overrides:
+    openstack-origin: cloud:precise-icehouse/proposed
+    source: cloud:precise-updates/icehouse
+precise-icehouse-staging:
+  inherits: precise-icehouse
+  overrides:
+    openstack-origin: ppa:ubuntu-cloud-archive/icehouse-staging
+    source: ppa:ubuntu-cloud-archive/icehouse-staging
+precise-icehouse-trunk:
+  inherits: precise-icehouse
+  overrides:
+    openstack-origin: ppa:openstack-ubuntu-testing/icehouse
+    source: ppa:openstack-ubuntu-testing/icehouse
+trusty-icehouse:
+  inherits: openstack-icehouse
+  series: trusty
+trusty-icehouse-msg-split:
+  inherits: openstack-icehouse-msg-split
+  series: trusty
+trusty-icehouse-proposed:
+  inherits: trusty-icehouse
+  overrides:
+    source: proposed
+    openstack-origin: distro-proposed
+trusty-icehouse-trunk:
+  inherits: trusty-icehouse
+  overrides:
+    openstack-origin: ppa:openstack-ubuntu-testing/icehouse
+    source: ppa:openstack-ubuntu-testing/icehouse
+    offline-compression: "no"
+# juno
+trusty-juno:
+  inherits: openstack-icehouse
+  series: trusty
+  overrides:
+    openstack-origin: cloud:trusty-juno
+    source: cloud:trusty-juno
+trusty-juno-proposed:
+  inherits: trusty-juno
+  overrides:
+    openstack-origin: cloud:trusty-juno/proposed
+    source: cloud:trusty-juno/proposed
+trusty-juno-staging:
+  inherits: trusty-juno
+  overrides:
+    openstack-origin: ppa:ubuntu-cloud-archive/juno-staging
+    source: ppa:ubuntu-cloud-archive/juno-staging
+utopic-juno:
+  inherits: openstack-icehouse
+  series: utopic
+utopic-juno-proposed:
+  inherits: utopic-juno
+  overrides:
+    source: proposed
+    openstack-origin: distro-proposed
+# kilo
+trusty-kilo:
+  inherits: openstack-icehouse
+  series: trusty
+  overrides:
+    openstack-origin: cloud:trusty-kilo
+    source: cloud:trusty-kilo
+trusty-kilo-proposed:
+  inherits: trusty-kilo
+  overrides:
+    openstack-origin: cloud:trusty-kilo/proposed
+    source: cloud:trusty-kilo/proposed
+trusty-kilo-staging:
+  inherits: trusty-kilo
+  overrides:
+    openstack-origin: ppa:ubuntu-cloud-archive/kilo-staging
+    source: ppa:ubuntu-cloud-archive/kilo-staging
+vivid-kilo:
+  inherits: openstack-icehouse
+  series: vivid
+vivid-kilo-proposed:
+  inherits: vivid-kilo
+  overrides:
+    source: proposed
+    openstack-origin: distro-proposed
+# liberty
+trusty-liberty:
+  inherits: openstack-icehouse
+  series: trusty
+  overrides:
+    openstack-origin: cloud:trusty-liberty
+    source: cloud:trusty-liberty
+trusty-liberty-proposed:
+  inherits: trusty-liberty
+  overrides:
+    openstack-origin: cloud:trusty-liberty/proposed
+    source: cloud:trusty-liberty/proposed
+trusty-liberty-staging:
+  inherits: trusty-liberty
+  overrides:
+    openstack-origin: ppa:ubuntu-cloud-archive/liberty-staging
+    source: ppa:ubuntu-cloud-archive/liberty-staging
+wily-liberty:
+  inherits: openstack-icehouse
+  series: wily
+wily-liberty-proposed:
+  inherits: wily-liberty
+  overrides:
+    source: proposed
+    openstack-origin: distro-proposed
+

=== added directory 'bundles/lxd/source'
=== added file 'bundles/lxd/source/cinder-master.yaml'
--- bundles/lxd/source/cinder-master.yaml	1970-01-01 00:00:00 +0000
+++ bundles/lxd/source/cinder-master.yaml	2015-07-27 14:48:51 +0000
@@ -0,0 +1,10 @@
+repositories:
+  - {name: requirements,
+     repository: 'git://github.com/openstack/requirements',
+     branch: master}
+  - {name: cinder,
+     repository: 'git://github.com/openstack/cinder',
+     branch: master}
+directory: /mnt/openstack-git
+http_proxy: http://squid.internal:3128
+https_proxy: http://squid.internal:3128

=== added file 'bundles/lxd/source/glance-master.yaml'
--- bundles/lxd/source/glance-master.yaml	1970-01-01 00:00:00 +0000
+++ bundles/lxd/source/glance-master.yaml	2015-07-27 14:48:51 +0000
@@ -0,0 +1,10 @@
+repositories:
+  - {name: requirements,
+     repository: 'git://github.com/openstack/requirements',
+     branch: master}
+  - {name: glance,
+     repository: 'git://github.com/openstack/glance',
+     branch: master}
+directory: /mnt/openstack-git
+http_proxy: http://squid.internal:3128
+https_proxy: http://squid.internal:3128

=== added file 'bundles/lxd/source/horizon-master.yaml'
--- bundles/lxd/source/horizon-master.yaml	1970-01-01 00:00:00 +0000
+++ bundles/lxd/source/horizon-master.yaml	2015-07-27 14:48:51 +0000
@@ -0,0 +1,10 @@
+repositories:
+  - {name: requirements,
+     repository: 'git://github.com/openstack/requirements',
+     branch: master}
+  - {name: horizon,
+     repository: 'git://github.com/openstack/horizon',
+     branch: master}
+directory: /mnt/openstack-git
+http_proxy: http://squid.internal:3128
+https_proxy: http://squid.internal:3128

=== added file 'bundles/lxd/source/keystone-master.yaml'
--- bundles/lxd/source/keystone-master.yaml	1970-01-01 00:00:00 +0000
+++ bundles/lxd/source/keystone-master.yaml	2015-07-27 14:48:51 +0000
@@ -0,0 +1,10 @@
+repositories:
+  - {name: requirements,
+     repository: 'git://github.com/openstack/requirements',
+     branch: master}
+  - {name: keystone,
+     repository: 'git://github.com/openstack/keystone',
+     branch: master}
+directory: /mnt/openstack-git
+http_proxy: http://squid.internal:3128
+https_proxy: http://squid.internal:3128

=== added file 'bundles/lxd/source/lxd.yaml'
--- bundles/lxd/source/lxd.yaml	1970-01-01 00:00:00 +0000
+++ bundles/lxd/source/lxd.yaml	2015-07-27 14:48:51 +0000
@@ -0,0 +1,367 @@
+# vim: set ts=2 et:
+# deployer bundle for development ('lxd') charms
+# UOSCI relies on this for OS-on-OS deployment testing
+openstack-services:
+  services:
+    mysql:
+      branch: lp:~openstack-charmers/charms/trusty/percona-cluster/next
+      constraints: mem=1G
+      options:
+        dataset-size: 50%
+    rabbitmq-server:
+      branch: lp:~openstack-charmers/charms/trusty/rabbitmq-server/next
+      constraints: mem=1G
+    ceph:
+      branch: lp:~openstack-charmers/charms/trusty/ceph/next
+      num_units: 3
+      constraints: mem=1G
+      options:
+        monitor-count: 3
+        fsid: 6547bd3e-1397-11e2-82e5-53567c8d32dc
+        monitor-secret: AQCXrnZQwI7KGBAAiPofmKEXKxu5bUzoYLVkbQ==
+        osd-devices: /dev/vdb
+        osd-reformat: "yes"
+        ephemeral-unmount: /mnt
+    keystone:
+      branch: lp:~openstack-charmers/charms/trusty/keystone/next
+      constraints: mem=1G
+      options:
+        admin-password: openstack
+        admin-token: ubuntutesting
+    openstack-dashboard:
+      branch: lp:~openstack-charmers/charms/trusty/openstack-dashboard/next
+      constraints: mem=1G
+    nova-compute:
+      branch: lp:~zulcss/charms/trusty/nova-compute/nova-compute-lxd
+      num_units: 3
+      constraints: mem=4G
+      options:
+        enable-live-migration: True
+        enable-resize: True
+        virt-type: lxd
+    nova-cloud-controller:
+      branch: lp:~openstack-charmers/charms/trusty/nova-cloud-controller/next
+      constraints: mem=1G
+      options:
+        network-manager: Neutron
+        quantum-security-groups: "yes"
+    neutron-gateway:
+      branch: lp:~openstack-charmers/charms/trusty/neutron-gateway/next
+      constraints: mem=1G
+      options:
+        instance-mtu: 1300
+    cinder:
+      branch: lp:~openstack-charmers/charms/trusty/cinder/next
+      options:
+        block-device: "None"
+        glance-api-version: 2
+      constraints: mem=1G
+#    cinder-ceph:
+#      branch: lp:~openstack-charmers/charms/trusty/cinder-ceph/next
+    glance:
+      branch: lp:~openstack-charmers/charms/trusty/glance/next
+      constraints: mem=1G
+    swift-proxy:
+      branch: lp:~openstack-charmers/charms/trusty/swift-proxy/next
+      constraints: mem=1G
+      options:
+        zone-assignment: manual
+        replicas: 3
+        swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae
+    swift-storage-z1:
+      branch: lp:~openstack-charmers/charms/trusty/swift-storage/next
+      constraints: mem=1G
+      options:
+        zone: 1
+        block-device: vdb
+        overwrite: "true"
+    swift-storage-z2:
+      branch: lp:~openstack-charmers/charms/trusty/swift-storage/next
+      constraints: mem=1G
+      options:
+        zone: 2
+        block-device: vdb
+        overwrite: "true"
+    swift-storage-z3:
+      branch: lp:~openstack-charmers/charms/trusty/swift-storage/next
+      constraints: mem=1G
+      options:
+        zone: 3
+        block-device: vdb
+        overwrite: "true"
+    ceilometer:
+      branch: lp:~openstack-charmers/charms/trusty/ceilometer/next
+      constraints: mem=1G
+    ceilometer-agent:
+      branch: lp:~openstack-charmers/charms/trusty/ceilometer-agent/next
+    heat:
+      branch: lp:~openstack-charmers/charms/trusty/heat/next
+    mongodb:
+      branch: lp:charms/trusty/mongodb
+      constraints: mem=1G
+    lxd:
+      branch: lp:~zulcss/+junk/lxd-container
+      options:
+        lxd-block-device: /mnt/disk.img|20G
+        lxd-origin: ppa:ubuntu-lxc/lxd-git-master
+        lxd-use-source: True
+        lxd-trust-password: blah
+  relations:
+    - [ keystone, mysql ]
+    - [ nova-cloud-controller, mysql ]
+    - [ nova-cloud-controller, rabbitmq-server ]
+    - [ nova-cloud-controller, glance ]
+    - [ nova-cloud-controller, keystone ]
+    - [ nova-compute, nova-cloud-controller ]
+    - [ nova-compute, mysql ]
+    - [ nova-compute, lxd ]
+    - - nova-compute
+      - rabbitmq-server:amqp
+    - [ nova-compute, glance ]
+    - [ nova-compute, ceph ]
+    - [ glance, mysql ]
+    - [ glance, keystone ]
+    - [ glance, ceph ]
+    - [ glance, cinder ]
+    - [ cinder, mysql ]
+    - [ cinder, rabbitmq-server ]
+    - [ cinder, nova-cloud-controller ]
+    - [ cinder, keystone ]
+    - [ cinder, ceph ]
+#    - [ cinder, cinder-ceph ]
+#    - [ cinder-ceph, ceph ]
+    - [ neutron-gateway, mysql ]
+    - [ neutron-gateway, nova-cloud-controller ]
+    - [ openstack-dashboard, keystone ]
+    - [ swift-proxy, keystone ]
+    - [ swift-proxy, swift-storage-z1 ]
+    - [ swift-proxy, swift-storage-z2 ]
+    - [ swift-proxy, swift-storage-z3 ]
+    - - ceilometer
+      - keystone:identity-service
+    - [ ceilometer, rabbitmq-server ]
+    - [ ceilometer, mongodb ]
+    - [ ceilometer-agent, nova-compute ]
+    - [ ceilometer-agent, ceilometer ]
+    - [ heat, mysql ]
+    - [ heat, keystone ]
+    - [ heat, rabbitmq-server ]
+openstack-singlerabbit:
+  inherits: openstack-services
+  relations:
+    - [ "neutron-gateway:amqp", rabbitmq-server ]
+openstack-icehouse:
+  inherits: openstack-singlerabbit
+  services:
+    neutron-api:
+      branch: lp:~openstack-charmers/charms/trusty/neutron-api/next
+      constraints: mem=1G
+      options:
+        neutron-security-groups: True
+    neutron-openvswitch:
+      branch: lp:~openstack-charmers/charms/trusty/neutron-openvswitch/next
+  relations:
+  - [ neutron-api, mysql ]
+  - [ neutron-api, rabbitmq-server ]
+  - [ neutron-api, nova-cloud-controller ]
+  - [ neutron-api, neutron-openvswitch ]
+  - [ neutron-api, keystone ]
+  - [ neutron-api, neutron-gateway ]
+  - [ neutron-openvswitch, nova-compute ]
+  - [ neutron-openvswitch, rabbitmq-server ]
+openstack-icehouse-msg-split:
+  inherits: openstack-services
+  services:
+    neutron-api:
+      branch: lp:~openstack-charmers/charms/trusty/neutron-api/next
+      constraints: mem=1G
+      options:
+        neutron-security-groups: True
+    neutron-openvswitch:
+      branch: lp:~openstack-charmers/charms/trusty/neutron-openvswitch/next
+    rabbitmq-server-neutron:
+      branch: lp:charms/trusty/rabbitmq-server
+      constraints: mem=1G
+  relations:
+  - [ neutron-api, mysql ]
+  - [ neutron-api, rabbitmq-server-neutron ]
+  - [ neutron-api, nova-cloud-controller ]
+  - [ neutron-api, neutron-openvswitch ]
+  - [ neutron-api, keystone ]
+  - [ neutron-api, neutron-gateway ]
+  - [ neutron-openvswitch, nova-compute ]
+  - [ neutron-openvswitch, rabbitmq-server-neutron ]
+  - [ "neutron-gateway:amqp-nova", rabbitmq-server ]
+  - [ "neutron-gateway:amqp", rabbitmq-server-neutron ]
+# icehouse
+openstack-icehouse-git:
+  inherits: openstack-icehouse
+  services:
+    keystone:
+      options:
+        openstack-origin-git: include-file://keystone-icehouse.yaml
+    glance:
+      options:
+        openstack-origin-git: include-file://glance-icehouse.yaml
+    cinder:
+      options:
+        openstack-origin-git: include-file://cinder-icehouse.yaml
+    neutron-api:
+      options:
+        openstack-origin-git: include-file://neutron-icehouse.yaml
+    neutron-gateway:
+      options:
+        openstack-origin-git: include-file://neutron-icehouse.yaml
+    neutron-openvswitch:
+      options:
+        openstack-origin-git: include-file://neutron-icehouse.yaml
+    openstack-dashboard:
+      options:
+        openstack-origin-git: include-file://horizon-icehouse.yaml
+    nova-compute:
+      options:
+        openstack-origin-git: include-file://nova-icehouse.yaml
+    nova-cloud-controller:
+      options:
+        openstack-origin-git: include-file://nova-icehouse.yaml
+precise-icehouse:
+  inherits: openstack-icehouse-git
+  series: precise
+  overrides:
+    openstack-origin: cloud:precise-icehouse
+    source: cloud:precise-icehouse
+trusty-icehouse:
+  inherits: openstack-icehouse-git
+  series: trusty
+# juno
+openstack-juno-git:
+  inherits: openstack-icehouse
+  services:
+    keystone:
+      options:
+        openstack-origin-git: include-file://keystone-juno.yaml
+    glance:
+      options:
+        openstack-origin-git: include-file://glance-juno.yaml
+    cinder:
+      options:
+        openstack-origin-git: include-file://cinder-juno.yaml
+    neutron-api:
+      options:
+        openstack-origin-git: include-file://neutron-juno.yaml
+    neutron-gateway:
+      options:
+        openstack-origin-git: include-file://neutron-juno.yaml
+    neutron-openvswitch:
+      options:
+        openstack-origin-git: include-file://neutron-juno.yaml
+    openstack-dashboard:
+      options:
+        openstack-origin-git: include-file://horizon-juno.yaml
+    nova-compute:
+      options:
+        openstack-origin-git: include-file://nova-juno.yaml
+    nova-cloud-controller:
+      options:
+        openstack-origin-git: include-file://nova-juno.yaml
+trusty-juno:
+  inherits: openstack-juno-git
+  series: trusty
+  overrides:
+    openstack-origin: cloud:trusty-juno
+    source: cloud:trusty-juno
+utopic-juno:
+  inherits: openstack-juno-git
+  series: utopic
+# kilo
+openstack-kilo-git:
+  inherits: openstack-icehouse
+  services:
+    keystone:
+      options:
+        openstack-origin-git: include-file://keystone-kilo.yaml
+    glance:
+      options:
+        openstack-origin-git: include-file://glance-kilo.yaml
+    cinder:
+      options:
+        openstack-origin-git: include-file://cinder-kilo.yaml
+    neutron-api:
+      options:
+        openstack-origin-git: include-file://neutron-kilo.yaml
+    neutron-gateway:
+      options:
+        openstack-origin-git: include-file://neutron-kilo.yaml
+    neutron-openvswitch:
+      options:
+        openstack-origin-git: include-file://neutron-kilo.yaml
+    openstack-dashboard:
+      options:
+        openstack-origin-git: include-file://horizon-kilo.yaml
+    nova-compute:
+      options:
+        openstack-origin-git: include-file://nova-kilo.yaml
+    nova-cloud-controller:
+      options:
+        openstack-origin-git: include-file://nova-kilo.yaml
+trusty-kilo:
+  inherits: openstack-kilo-git
+  series: trusty
+  overrides:
+    openstack-origin: cloud:trusty-kilo
+    source: cloud:trusty-kilo
+trusty-kilo-proposed:
+  inherits: openstack-kilo-git
+  series: trusty
+  overrides:
+    openstack-origin: cloud:trusty-kilo/proposed
+    source: cloud:trusty-kilo/proposed
+vivid-kilo:
+  inherits: openstack-kilo-git
+  series: vivid
+# master
+openstack-master-git:
+  inherits: openstack-icehouse
+  services:
+    keystone:
+      options:
+        openstack-origin-git: include-file://keystone-master.yaml
+    glance:
+      options:
+        openstack-origin-git: include-file://glance-master.yaml
+    cinder:
+      options:
+        openstack-origin-git: include-file://cinder-master.yaml
+    neutron-api:
+      options:
+        openstack-origin-git: include-file://neutron-master.yaml
+    neutron-gateway:
+      options:
+        openstack-origin-git: include-file://neutron-master.yaml
+    neutron-openvswitch:
+      options:
+        openstack-origin-git: include-file://neutron-master.yaml
+    openstack-dashboard:
+      options:
+        openstack-origin-git: include-file://horizon-master.yaml
+    nova-compute:
+      options:
+        openstack-origin-git: include-file://nova-master.yaml
+    nova-cloud-controller:
+      options:
+        openstack-origin-git: include-file://nova-master.yaml
+trusty-master:
+  inherits: openstack-master-git
+  series: trusty
+  overrides:
+    openstack-origin: cloud:trusty-kilo
+    source: cloud:trusty-kilo
+trusty-master-proposed:
+  inherits: openstack-master-git
+  series: trusty
+  overrides:
+    openstack-origin: cloud:trusty-kilo/proposed
+    source: cloud:trusty-kilo/proposed
+vivid-master:
+  inherits: openstack-master-git
+  series: vivid

=== added file 'bundles/lxd/source/neutron-master.yaml'
--- bundles/lxd/source/neutron-master.yaml	1970-01-01 00:00:00 +0000
+++ bundles/lxd/source/neutron-master.yaml	2015-07-27 14:48:51 +0000
@@ -0,0 +1,19 @@
+repositories:
+  - {name: requirements,
+     repository: 'git://github.com/openstack/requirements',
+     branch: master}
+  - {name: neutron-fwaas,
+     repository: 'git://github.com/openstack/neutron-fwaas',
+     branch: master}
+  - {name: neutron-lbaas,
+     repository: 'git://github.com/openstack/neutron-lbaas',
+     branch: master}
+  - {name: neutron-vpnaas,
+     repository: 'git://github.com/openstack/neutron-vpnaas',
+     branch: master}
+  - {name: neutron,
+     repository: 'git://github.com/openstack/neutron',
+     branch: master}
+directory: /mnt/openstack-git
+http_proxy: http://squid.internal:3128
+https_proxy: http://squid.internal:3128

=== added file 'bundles/lxd/source/nova-master.yaml'
--- bundles/lxd/source/nova-master.yaml	1970-01-01 00:00:00 +0000
+++ bundles/lxd/source/nova-master.yaml	2015-07-27 14:48:51 +0000
@@ -0,0 +1,19 @@
+repositories:
+  - {name: requirements,
+     repository: 'git://github.com/openstack/requirements',
+     branch: master}
+  - {name: neutron,
+     repository: 'git://github.com/openstack/neutron',
+     branch: master}
+  - {name: pylxd,
+     repository: 'https://github.com/lxc/pylxd',
+     branch: master}
+  - {name: nova-compute-lxd,
+     repository: 'https://github.com/lxc/nova-compute-lxd',
+     branch: master}
+  - {name: nova,
+     repository: 'git://github.com/openstack/nova',
+     branch: master}
+directory: /mnt/openstack-git
+http_proxy: http://squid.internal:3128
+https_proxy: http://squid.internal:3128

=== modified file 'configure'
--- configure	2015-07-15 09:26:36 +0000
+++ configure	2015-07-27 14:48:51 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-valid="stsstack dellstack kernelstack ppc64el powerkvm"
+valid="stsstack dellstack kernelstack ppc64el powerkvm lxd"
 
 usage() {
   echo "$0 <profile>"

=== added file 'profiles/lxd'
--- profiles/lxd	1970-01-01 00:00:00 +0000
+++ profiles/lxd	2015-07-27 14:48:51 +0000
@@ -0,0 +1,69 @@
+#!/bin/bash
+
+set -ex
+
+# Set serverstack defaults, if not already set.
+[[ -z "$GATEWAY" ]] && export GATEWAY="10.5.0.1"
+[[ -z "$CIDR_EXT" ]] && export CIDR_EXT="10.5.0.0/16"
+[[ -z "$FIP_RANGE" ]] && export FIP_RANGE="10.5.150.0:10.5.200.254"
+[[ -z "$NAMESERVER" ]] && export NAMESERVER="10.245.160.2"
+[[ -z "$CIDR_PRIV" ]] && export CIDR_PRIV="192.168.21.0/24"
+[[ -z "$SWIFT_IP" ]] && export SWIFT_IP="10.245.160.50"
+
+# Accept network type as first parameter, assume gre if unspecified
+net_type=${1:-"gre"}
+
+# If not on bare metal, add extra port to overcloud neutron-gateway and configure charm to use it
+if [[ "${BARE_METAL^^}" != "TRUE" ]]; then
+    source ~/novarc
+    ./bin/post-deploy-config neutron-gateway
+fi
+
+# Configure neutron networking on overcloud
+source novarc
+./bin/quantum-ext-net --network-type $net_type -g $GATEWAY -c $CIDR_EXT -f $FIP_RANGE ext_net
+./bin/quantum-tenant-net --network-type $net_type -t admin -r provider-router -N $NAMESERVER private $CIDR_PRIV
+
+# Create demo/testing users, tenants and flavor
+keystone tenant-create --name demo
+keystone user-create --name demo --tenant demo --pass pass --enabled true --email [e-mail]
+keystone user-role-add --user demo --role Member --tenant demo || :
+keystone tenant-create --name alt_demo
+keystone user-create --name alt_demo --tenant alt_demo --pass secret --enabled true --email [e-mail]
+keystone user-role-add --user alt_demo --role Member --tenant alt_demo || :
+
+nova flavor-create m1.cirros 6 64 1 1
+nova flavor-create m1.tempest 7 256 5 1
+nova flavor-create m2.tempest 8 512 5 1
+
+# Gather vars for tempest template
+access=$(keystone --os-username demo --os-password pass --os-tenant-name demo ec2-credentials-create | grep access | awk '{ print $4 }')
+secret=$(keystone ec2-credentials-get --access $access | grep secret | awk '{ print $4 }')
+image_id=$(glance image-list | grep cirros | awk '{ print $2 }')
+image_alt_id=$(glance image-list | grep precise | awk '{ print $2 }')
+ext_net=$(neutron net-list | grep ext_net | awk '{ print $2 }')
+router=$(neutron router-list | grep provider-router | awk '{ print $2}')
+keystone=$(juju-deployer -f keystone)
+dashboard=$(juju-deployer -f openstack-dashboard)
+ncc=$(juju-deployer -f nova-cloud-controller)
+http=${OS_AUTH_PROTOCOL:-http}
+
+# Insert vars into tempest conf
+sed -e "s/__IMAGE_ID__/$image_id/g" -e "s/__IMAGE_ALT_ID__/$image_alt_id/g" \
+    -e "s/__DASHBOARD__/$dashboard/g" -e "s/__KEYSTONE__/$keystone/g" \
+    -e "s/__EXT_NET__/$ext_net/g" -e "s/__PROTO__/$http/g" \
+    -e "s/__SWIFT__/$SWIFT_IP/g" \
+    -e "s/__NCC__/$ncc/g" -e "s/__SECRET__/$secret/g" -e "s/__ACCESS__/$access/g" \
+    templates/tempest/tempest.conf.template > tempest.conf
+
+# Install dependencies and CLI tools
+# See also requirements.txt in tempest (probably need to sudo pip install -r requirements.txt)
+sudo apt-get install git testrepository subunit python-nose python-lxml python-boto \
+    python-junitxml python-subunit python-testresources python-oslotest python-stevedore \
+    python-cinderclient python-glanceclient python-heatclient python-keystoneclient \
+    python-neutronclient python-novaclient python-swiftclient python-ceilometerclient \
+    openvswitch-test openvswitch-common -y
+
+# Git tempest, place the rendered tempest template
+[ -d tempest ] || git clone https://github.com/openstack/tempest
+cp tempest.conf tempest/etc

=== added file 'tools/images-lxd-convert.sh'
--- tools/images-lxd-convert.sh	1970-01-01 00:00:00 +0000
+++ tools/images-lxd-convert.sh	2015-07-27 14:48:51 +0000
@@ -0,0 +1,221 @@
+#!/bin/bash
+
+VERBOSITY=0
+TEMP_D=""
+UC_PREP="/usr/share/lxc/hooks/ubuntu-cloud-prep"
+
+error() { echo "$@" 1>&2; }
+fail() { [ $# -eq 0 ] || error "$@"; exit 1; }
+
+Usage() {
+	cat <<EOF
+Usage: ${0##*/} [ options ] input-tar output-tarball
+
+   convert cloud-image-root.tar.gz into lxd compatible format,
+   and stuff nocloud seed in on the way.
+
+   options:
+      -h|--help         this help
+      -v|--verbose
+         --metadata     file to include as metadata.yaml
+      -u|--userdata U   user-data for seed.
+      -S|--auth-key P   pubkey to insert
+      -C|--cloud    C   do not seed instance
+         --zip      Z   compress with tar option Z (default 'J')
+EOF
+}
+
+bad_Usage() { Usage 1>&2; [ $# -eq 0 ] || error "$@"; return 1; }
+cleanup() {
+	[ -z "${TEMP_D}" -o ! -d "${TEMP_D}" ] || rm -Rf "${TEMP_D}"
+}
+
+debug() {
+	local level=${1}; shift;
+	[ "${level}" -gt "${VERBOSITY}" ] && return
+	error "${@}"
+}
+
+default_mdyaml() {
+cat <<EOF
+architecture: "$(uname -m)"
+creation_date: $(date "+%s")
+name: "$1"
+properties:
+  description: Ubuntu 14.04 LTS Intel 64bit
+  os: Ubuntu
+EOF
+}
+
+default_userdata() {
+	cat <<EOF
+#cloud-config
+manage_etc_hosts: localhost
+password: ubuntu
+chpasswd: { expire: false; }
+
+# pollinate hangs without socket timeout if it can't reach network
+random_seed:
+   command: null
+
+# growpart and resize_rootfs dont make sense, and should dtrt, but be sure.
+growpart:
+  mode: off
+resize_rootfs: null
+EOF
+}
+
+main() {
+	local short_opts="Chu:S:v"
+	local long_opts="auth-key:,cloud,help,metadata:,userdata:,verbose,zip:"
+	local getopt_out=""
+	local pt=""
+	getopt_out=$(getopt --name "${0##*/}" \
+		--options "${short_opts}" --long "${long_opts}" -- "$@") &&
+		eval set -- "${getopt_out}" ||
+		{ bad_Usage; return; }
+
+	local cur="" next="" input="" output="" authkey="" z_opt="J" vflags=""
+	local ud=""
+	pt=( )
+
+	while [ $# -ne 0 ]; do
+		cur="$1"; next="$2";
+		case "$cur" in
+			-h|--help) Usage ; exit 0;;
+			-v|--verbose) VERBOSITY=$((${VERBOSITY}+1))
+				vflags="${vflags}v";;
+			   --metadata) mdyaml="$next";;
+			-u|--userdata)
+				ud="$next"; pt[${#pt[@]}]="--userdata=$next"; shift;;
+		    -S|--auth-key) pt[${#pt[@]}]="--auth-key=$next"; shift;;
+		    -C|--cloud)    pt[${#pt[@]}]="--cloud=$next"; shift;;
+		       --zip)	z_opt=$next; shift;;
+			--) shift; break;;
+		esac
+		shift;
+	done
+	[ -z "$vflags" ] || vflags="-$vflags"
+
+	[ $# -ne 0 ] || { bad_Usage "must provide arguments"; return; }
+	[ $# -eq 2 ] ||
+		{ bad_Usage "confused by args. got $# expected 2 [$*]"; return; }
+
+	input=$1
+	output=$2
+
+	TEMP_D=$(mktemp -d "${TMPDIR:-/tmp}/${0##*/}.XXXXXX") ||
+		fail "failed to make tempdir"
+	trap cleanup EXIT
+
+	[ "$(id -u)" = "0" ] || { error "you're not root"; return 1; }
+	command -v "$UC_PREP" >/dev/null 2>&1 ||
+		{ error "$UC_PREP not available"; return 1; }
+	[ "$input" = "-" -o -f "$input" ] ||
+		{ error "$input: not a file or -"; return 1; }
+	[ -n "$output" ] || { error "$output: not a file or -"; return 1; }
+	[ -z "$mdyaml" -o -f "$mdyaml" ] ||
+		{ error "$mdyaml: not a file"; return 1; }
+
+	if [ -z "$ud" ]; then
+		ud="$TEMP_D/user-data"
+		default_userdata > "$ud"
+		pt[${#pt[@]}]="--userdata=$ud"
+	fi
+
+	local extract create ucprep
+	mkdir -p "${TEMP_D}/rootfs" || { error "failed to make rootfs"; return 1; }
+	extract=(
+   		tar -C "${TEMP_D}/rootfs"
+	   		--xattrs "--xattrs-include=*"
+	   		--anchored "--exclude=dev/*"
+	   		--numeric-owner -Sxpf "$input" )
+
+	create=(
+		tar -C "${TEMP_D}/"
+			--xattrs "--xattrs-include=*"
+			-cp${z_opt}f "$output" metadata.yaml rootfs )
+	create_pxz=(
+		bash -c 'set -o pipefail;
+			tar -C "$1" --xattrs "--xattrs-include=*" \
+				-cpf - metadata.yaml rootfs |
+			pxz -cv - > "$2"' -- "${TEMP_D}" "$output"
+	)
+	command -v pxz >/dev/null 2>&1 && create=( "${create_pxz[@]}" )
+
+	ucprep=(
+		"${UC_PREP}" $vflags "${pt[@]}" "${TEMP_D}/rootfs" )
+
+	if [ -n "$metadata" ]; then
+		cp "$metadata" "${TEMP_D}/metadata.yaml" ||
+			{ error "failed cp '$metadata' metadata.yaml"; return 1; }
+		debug 1 "copied metadata.yaml from '$metadata'"
+	else
+		local tname=""
+   		tname=${input%.gz};
+		tname=${tname%.tar};
+   		[ "$input" = "-" ] && tname="unknown name"
+		default_mdyaml "$tname" > "${TEMP_D}/metadata.yaml" ||
+			{ error "failed write metadata.yaml"; return 1; }
+		debug 1 "wrote questionable metadata.yaml file"
+	fi
+
+	debug 1 "extracting tar to tempdir"
+	debug 2 "cmd: ${extract[*]}"
+	"${extract[@]}" || { error "failed extraction"; return 1; }
+
+	debug 1 "hacking/fixing for lxd"
+	debug 2 "gettys just dont make sense, and upstart restarts"
+	( cd "${TEMP_D}/rootfs" &&
+		for f in etc/init/tty*.conf; do
+			[ -f "$f" ] || continue
+			#[ "${f##*/}" = "tty1.conf" ] || continue
+			o=${f%.conf}.override
+			debug 3 "manual > $o"
+			echo "manual" > "$o"
+		done
+	)
+
+	debug 2 "update-motd runs from mounted-run.conf on mounted tmpfs"
+	# this is too late to fix via bootcmd
+	nox="
+		etc/update-motd.d/90-updates-available
+		etc/update-motd.d/91-release-upgrade
+		usr/lib/ubuntu-release-upgrader/release-upgrade-motd
+		usr/lib/update-notifier/apt-check
+		usr/lib/update-notifier/update-motd-updates-available
+	"
+ 	( cd "${TEMP_D}/rootfs" && 
+		for f in $nox; do [ -e "$f" ] &&
+			debug 3 "chmod -x '$f'" && chmod -x "$f"; done )
+
+	debug 2 "pollinate is heavy, disabling"
+	( cd "${TEMP_D}/rootfs"
+		f=etc/init/pollinate.conf
+		c=${f%.conf}.override
+		[ -f "$f" ] && debug 3 "manual > $c" && echo "manual" > "$c"
+	)
+
+	debug 2 "mot.d is annoying here (LP: #1426023)"
+	# this affects ssh in time. as mot.d is run on ssh login
+	( cd "$TEMP_D/rootfs" &&
+		sudo sed -i '/^[^#].*pam_motd/s/^/#/' etc/pam.d/sshd )
+
+	debug 2 "disabling irqbalance (LP: #1454273)"
+	( cd "$TEMP_D/rootfs" &&
+		f=etc/init/irqbalance.conf
+		c=${f%.conf}.override
+		[ -f "$f" ] && debug 3 "manual > $c" && echo "manual" > "$c" )
+
+	debug 1 "running ucprep: ${ucprep[*]}"
+	"${ucprep[@]}" ||
+		{ error "failed to run ${ucprep[*]}"; return 1; }
+
+	debug 1 "writing tar to $out: ${create[*]}"
+	debug 2 "cmd: ${create[*]}"
+	"${create[@]}" || fail "failed writing tar to $out"
+	debug 1 "finished [${SECONDS}]"
+}
+
+main "$@"
+# vi: ts=4 noexpandtab

=== added file 'tools/images_lxd.sh'
--- tools/images_lxd.sh	1970-01-01 00:00:00 +0000
+++ tools/images_lxd.sh	2015-07-27 14:48:51 +0000
@@ -0,0 +1,16 @@
+#!/bin/bash -e
+# Download LX images and add to glance
+
+# Download images if not already present
+mkdir -p ~/images
+[ -f ~/images/trusty-server-cloudimg-amd64-root.tar.gz  ] || {
+	wget -O ~/images/trusty-server-cloudimg-amd64-root.tar.gz http://cloud-images.ubuntu.com/trusty/current/trusty-server-cloudimg-amd64-root.tar.gz
+}
+
+sudo images-lxd-convert.sh ~/images/trusty-server-cloudimg-amd64-root.tar.gz \
+	~/images/trusty-server-cloudimg-amd64-lxd.tar.gz
+
+# Upload glance images to overcloud
+glance image-create --name="trusty-lxd-amd64" --is-public=true --progress \
+	 --container-format=bare --disk-format=qcow2 <  ~/images/trusty-server-cloudimg-amd64-lxd.tar.gz
+