summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Coldrick <adam.coldrick@codethink.co.uk>2015-06-01 10:38:45 +0000
committerAdam Coldrick <adam.coldrick@codethink.co.uk>2015-06-01 14:03:09 +0000
commita7eaabeec2c6f77d7b326b23b3cee4bad21b3eb8 (patch)
tree6a723b920266270dfabb0f380a7b788b84d9c990
parent3ac442c4db9a3877c59adf2341aacc593d4b65ac (diff)
downloaddefinitions-a7eaabeec2c6f77d7b326b23b3cee4bad21b3eb8.tar.gz
Put all the extensions in a subdirectory
-rw-r--r--VERSION2
-rw-r--r--clusters/image-package-example.morph2
-rw-r--r--extensions/busybox-init.configure (renamed from busybox-init.configure)0
-rw-r--r--extensions/ceph.configure (renamed from ceph.configure)0
-rwxr-xr-xextensions/cloud-init.configure (renamed from cloud-init.configure)0
-rw-r--r--extensions/distbuild.configure (renamed from distbuild.configure)0
-rw-r--r--extensions/hosts (renamed from hosts)0
-rw-r--r--extensions/image-package-example/README (renamed from image-package-example/README)0
-rw-r--r--extensions/image-package-example/common.sh.in (renamed from image-package-example/common.sh.in)0
-rw-r--r--extensions/image-package-example/disk-install.sh.in (renamed from image-package-example/disk-install.sh.in)0
-rw-r--r--extensions/image-package-example/make-disk-image.sh.in (renamed from image-package-example/make-disk-image.sh.in)0
-rwxr-xr-xextensions/image-package.write (renamed from image-package.write)0
-rwxr-xr-xextensions/installer.configure (renamed from installer.configure)0
-rw-r--r--extensions/jffs2.write (renamed from jffs2.write)0
-rw-r--r--extensions/jffs2.write.help (renamed from jffs2.write.help)0
-rw-r--r--extensions/mason.configure (renamed from mason.configure)0
-rw-r--r--extensions/moonshot-kernel.configure (renamed from moonshot-kernel.configure)0
-rwxr-xr-xextensions/nfsboot-server.configure (renamed from nfsboot-server.configure)0
-rw-r--r--extensions/openstack-ceilometer.configure (renamed from openstack-ceilometer.configure)0
-rw-r--r--extensions/openstack-cinder.configure (renamed from openstack-cinder.configure)0
-rw-r--r--extensions/openstack-glance.configure (renamed from openstack-glance.configure)0
-rw-r--r--extensions/openstack-ironic.configure (renamed from openstack-ironic.configure)0
-rw-r--r--extensions/openstack-keystone.configure (renamed from openstack-keystone.configure)0
-rw-r--r--extensions/openstack-network.configure (renamed from openstack-network.configure)0
-rw-r--r--extensions/openstack-neutron.configure (renamed from openstack-neutron.configure)0
-rw-r--r--extensions/openstack-nova.configure (renamed from openstack-nova.configure)0
-rw-r--r--extensions/openstack-swift-controller.configure (renamed from openstack-swift-controller.configure)0
-rwxr-xr-xextensions/pxeboot.check (renamed from pxeboot.check)0
-rw-r--r--extensions/pxeboot.write (renamed from pxeboot.write)0
-rw-r--r--extensions/pxeboot.write.help (renamed from pxeboot.write.help)0
-rwxr-xr-xextensions/sdk.write (renamed from sdk.write)0
-rwxr-xr-xextensions/strip-gplv3.configure (renamed from strip-gplv3.configure)0
-rw-r--r--extensions/swift-build-rings.yml (renamed from swift-build-rings.yml)0
-rwxr-xr-xextensions/swift-storage-devices-validate.py (renamed from swift-storage-devices-validate.py)0
-rw-r--r--extensions/swift-storage.configure (renamed from swift-storage.configure)0
-rwxr-xr-xextensions/trove.configure (renamed from trove.configure)0
-rw-r--r--extensions/trove.configure.help (renamed from trove.configure.help)0
-rw-r--r--extensions/vagrant.configure (renamed from vagrant.configure)0
38 files changed, 2 insertions, 2 deletions
diff --git a/VERSION b/VERSION
index 0a70affa..e9b5f147 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-version: 3
+version: 4
diff --git a/clusters/image-package-example.morph b/clusters/image-package-example.morph
index fd8487e2..6472b456 100644
--- a/clusters/image-package-example.morph
+++ b/clusters/image-package-example.morph
@@ -9,4 +9,4 @@ systems:
type: image-package
location: image-package-example.tar
BOOTLOADER_BLOBS: /usr/share/syslinux/mbr.bin
- INCLUDE_SCRIPTS: image-package-example/make-disk-image.sh.in:image-package-example/disk-install.sh.in:image-package-example/common.sh.in
+ INCLUDE_SCRIPTS: extensions/image-package-example/make-disk-image.sh.in:extensions/image-package-example/disk-install.sh.in:extensions/image-package-example/common.sh.in
diff --git a/busybox-init.configure b/extensions/busybox-init.configure
index c7dba3b9..c7dba3b9 100644
--- a/busybox-init.configure
+++ b/extensions/busybox-init.configure
diff --git a/ceph.configure b/extensions/ceph.configure
index c3cd92d1..c3cd92d1 100644
--- a/ceph.configure
+++ b/extensions/ceph.configure
diff --git a/cloud-init.configure b/extensions/cloud-init.configure
index aa83e0e2..aa83e0e2 100755
--- a/cloud-init.configure
+++ b/extensions/cloud-init.configure
diff --git a/distbuild.configure b/extensions/distbuild.configure
index 062aaecc..062aaecc 100644
--- a/distbuild.configure
+++ b/extensions/distbuild.configure
diff --git a/hosts b/extensions/hosts
index 5b97818d..5b97818d 100644
--- a/hosts
+++ b/extensions/hosts
diff --git a/image-package-example/README b/extensions/image-package-example/README
index c1322f25..c1322f25 100644
--- a/image-package-example/README
+++ b/extensions/image-package-example/README
diff --git a/image-package-example/common.sh.in b/extensions/image-package-example/common.sh.in
index 9a7389a7..9a7389a7 100644
--- a/image-package-example/common.sh.in
+++ b/extensions/image-package-example/common.sh.in
diff --git a/image-package-example/disk-install.sh.in b/extensions/image-package-example/disk-install.sh.in
index bc8e0e67..bc8e0e67 100644
--- a/image-package-example/disk-install.sh.in
+++ b/extensions/image-package-example/disk-install.sh.in
diff --git a/image-package-example/make-disk-image.sh.in b/extensions/image-package-example/make-disk-image.sh.in
index 61264fa0..61264fa0 100644
--- a/image-package-example/make-disk-image.sh.in
+++ b/extensions/image-package-example/make-disk-image.sh.in
diff --git a/image-package.write b/extensions/image-package.write
index 15ceadcf..15ceadcf 100755
--- a/image-package.write
+++ b/extensions/image-package.write
diff --git a/installer.configure b/extensions/installer.configure
index a77dc851..a77dc851 100755
--- a/installer.configure
+++ b/extensions/installer.configure
diff --git a/jffs2.write b/extensions/jffs2.write
index 46b69a53..46b69a53 100644
--- a/jffs2.write
+++ b/extensions/jffs2.write
diff --git a/jffs2.write.help b/extensions/jffs2.write.help
index 059a354b..059a354b 100644
--- a/jffs2.write.help
+++ b/extensions/jffs2.write.help
diff --git a/mason.configure b/extensions/mason.configure
index 1198ebd0..1198ebd0 100644
--- a/mason.configure
+++ b/extensions/mason.configure
diff --git a/moonshot-kernel.configure b/extensions/moonshot-kernel.configure
index 11d01751..11d01751 100644
--- a/moonshot-kernel.configure
+++ b/extensions/moonshot-kernel.configure
diff --git a/nfsboot-server.configure b/extensions/nfsboot-server.configure
index 9fb48096..9fb48096 100755
--- a/nfsboot-server.configure
+++ b/extensions/nfsboot-server.configure
diff --git a/openstack-ceilometer.configure b/extensions/openstack-ceilometer.configure
index 9c0b7b6d..9c0b7b6d 100644
--- a/openstack-ceilometer.configure
+++ b/extensions/openstack-ceilometer.configure
diff --git a/openstack-cinder.configure b/extensions/openstack-cinder.configure
index 4c32e11a..4c32e11a 100644
--- a/openstack-cinder.configure
+++ b/extensions/openstack-cinder.configure
diff --git a/openstack-glance.configure b/extensions/openstack-glance.configure
index 5da08895..5da08895 100644
--- a/openstack-glance.configure
+++ b/extensions/openstack-glance.configure
diff --git a/openstack-ironic.configure b/extensions/openstack-ironic.configure
index 962bbcd1..962bbcd1 100644
--- a/openstack-ironic.configure
+++ b/extensions/openstack-ironic.configure
diff --git a/openstack-keystone.configure b/extensions/openstack-keystone.configure
index 6b011b14..6b011b14 100644
--- a/openstack-keystone.configure
+++ b/extensions/openstack-keystone.configure
diff --git a/openstack-network.configure b/extensions/openstack-network.configure
index 10be5a1c..10be5a1c 100644
--- a/openstack-network.configure
+++ b/extensions/openstack-network.configure
diff --git a/openstack-neutron.configure b/extensions/openstack-neutron.configure
index 210222db..210222db 100644
--- a/openstack-neutron.configure
+++ b/extensions/openstack-neutron.configure
diff --git a/openstack-nova.configure b/extensions/openstack-nova.configure
index 213f1852..213f1852 100644
--- a/openstack-nova.configure
+++ b/extensions/openstack-nova.configure
diff --git a/openstack-swift-controller.configure b/extensions/openstack-swift-controller.configure
index 424ab57b..424ab57b 100644
--- a/openstack-swift-controller.configure
+++ b/extensions/openstack-swift-controller.configure
diff --git a/pxeboot.check b/extensions/pxeboot.check
index 611708a9..611708a9 100755
--- a/pxeboot.check
+++ b/extensions/pxeboot.check
diff --git a/pxeboot.write b/extensions/pxeboot.write
index 3a12ebcc..3a12ebcc 100644
--- a/pxeboot.write
+++ b/extensions/pxeboot.write
diff --git a/pxeboot.write.help b/extensions/pxeboot.write.help
index 7cb78bce..7cb78bce 100644
--- a/pxeboot.write.help
+++ b/extensions/pxeboot.write.help
diff --git a/sdk.write b/extensions/sdk.write
index 8d3d2a63..8d3d2a63 100755
--- a/sdk.write
+++ b/extensions/sdk.write
diff --git a/strip-gplv3.configure b/extensions/strip-gplv3.configure
index c08061ad..c08061ad 100755
--- a/strip-gplv3.configure
+++ b/extensions/strip-gplv3.configure
diff --git a/swift-build-rings.yml b/extensions/swift-build-rings.yml
index 1ffe9c37..1ffe9c37 100644
--- a/swift-build-rings.yml
+++ b/extensions/swift-build-rings.yml
diff --git a/swift-storage-devices-validate.py b/extensions/swift-storage-devices-validate.py
index 57ab23d0..57ab23d0 100755
--- a/swift-storage-devices-validate.py
+++ b/extensions/swift-storage-devices-validate.py
diff --git a/swift-storage.configure b/extensions/swift-storage.configure
index 391b392a..391b392a 100644
--- a/swift-storage.configure
+++ b/extensions/swift-storage.configure
diff --git a/trove.configure b/extensions/trove.configure
index f823762c..f823762c 100755
--- a/trove.configure
+++ b/extensions/trove.configure
diff --git a/trove.configure.help b/extensions/trove.configure.help
index c96bdf74..c96bdf74 100644
--- a/trove.configure.help
+++ b/extensions/trove.configure.help
diff --git a/vagrant.configure b/extensions/vagrant.configure
index abc3ea0c..abc3ea0c 100644
--- a/vagrant.configure
+++ b/extensions/vagrant.configure