From 24dddbb8d62a2b4b566ff06aab29574d4ff97a57 Mon Sep 17 00:00:00 2001 From: Anders Ingemann Date: Sun, 24 May 2015 14:19:54 +0200 Subject: [PATCH] First stab at cleaning up the manifest dir --- manifests/ec2-ebs-partitioned.manifest.yml | 28 ------------------- manifests/ec2-ebs-single.manifest.yml | 28 ------------------- .../azure/wheezy.yml} | 0 .../ec2/ebs-testing-amd64-pvm.yml} | 0 .../ec2/ebs-unstable-amd64-pvm-contrib.yml} | 0 .../ec2/ebs-unstable-amd64-pvm.yml} | 0 .../ec2/s3-wheezy-amd64-pvm.yml} | 0 .../gce/jessie-backports.yml} | 0 .../gce/jessie.yml} | 0 .../gce/wheezy-backports.yml} | 0 .../gce/wheezy.yml} | 0 .../kvm/wheezy-virtio.yml} | 0 .../kvm/wheezy.yml} | 0 .../virtualbox/wheezy-vagrant.yml} | 0 .../virtualbox/wheezy.yml} | 0 manifests/official/README.rst | 0 .../ec2/ebs-squeeze-amd64-pvm.yml} | 0 .../ec2/ebs-squeeze-i386-pvm.yml} | 0 .../ec2/ebs-wheezy-amd64-hvm-cn-north-1.yml} | 0 .../ec2/ebs-wheezy-amd64-hvm.yml} | 0 .../ec2/ebs-wheezy-amd64-pvm-cn-north-1.yml} | 0 .../ec2/ebs-wheezy-amd64-pvm.yml} | 0 .../ec2/ebs-wheezy-i386-pvm.yml} | 0 .../ec2/s3-wheezy-amd64-pvm-cn-north-1.yml} | 0 24 files changed, 56 deletions(-) delete mode 100644 manifests/ec2-ebs-partitioned.manifest.yml delete mode 100644 manifests/ec2-ebs-single.manifest.yml rename manifests/{azure.manifest.yml => examples/azure/wheezy.yml} (100%) rename manifests/{ec2-ebs-debian-testing-amd64-pvm.manifest.yml => examples/ec2/ebs-testing-amd64-pvm.yml} (100%) rename manifests/{ec2-ebs-debian-unstable-contrib-amd64-pvm.manifest.yml => examples/ec2/ebs-unstable-amd64-pvm-contrib.yml} (100%) rename manifests/{ec2-ebs-debian-unstable-amd64-pvm.manifest.yml => examples/ec2/ebs-unstable-amd64-pvm.yml} (100%) rename manifests/{ec2-s3.manifest.yml => examples/ec2/s3-wheezy-amd64-pvm.yml} (100%) rename manifests/{gce-jessie-backports.manifest.yml => examples/gce/jessie-backports.yml} (100%) rename manifests/{gce-jessie.manifest.yml => examples/gce/jessie.yml} (100%) rename manifests/{gce-wheezy-backports.manifest.yml => examples/gce/wheezy-backports.yml} (100%) rename manifests/{gce-wheezy.manifest.yml => examples/gce/wheezy.yml} (100%) rename manifests/{kvm-virtio.manifest.yml => examples/kvm/wheezy-virtio.yml} (100%) rename manifests/{kvm.manifest.yml => examples/kvm/wheezy.yml} (100%) rename manifests/{virtualbox-vagrant.manifest.yml => examples/virtualbox/wheezy-vagrant.yml} (100%) rename manifests/{virtualbox.manifest.yml => examples/virtualbox/wheezy.yml} (100%) create mode 100644 manifests/official/README.rst rename manifests/{squeeze-ec2-ebs-debian-official-amd64-pvm.manifest.yml => official/ec2/ebs-squeeze-amd64-pvm.yml} (100%) rename manifests/{squeeze-ec2-ebs-debian-official-i386-pvm.manifest.yml => official/ec2/ebs-squeeze-i386-pvm.yml} (100%) rename manifests/{ec2-ebs-debian-official-amd64-hvm-cn-north-1.manifest.yml => official/ec2/ebs-wheezy-amd64-hvm-cn-north-1.yml} (100%) rename manifests/{ec2-ebs-debian-official-amd64-hvm.manifest.yml => official/ec2/ebs-wheezy-amd64-hvm.yml} (100%) rename manifests/{ec2-ebs-debian-official-amd64-pvm-cn-north-1.manifest.yml => official/ec2/ebs-wheezy-amd64-pvm-cn-north-1.yml} (100%) rename manifests/{ec2-ebs-debian-official-amd64-pvm.manifest.yml => official/ec2/ebs-wheezy-amd64-pvm.yml} (100%) rename manifests/{ec2-ebs-debian-official-i386-pvm.manifest.yml => official/ec2/ebs-wheezy-i386-pvm.yml} (100%) rename manifests/{ec2-s3-debian-official-amd64-pvm-cn-north-1.manifest.yml => official/ec2/s3-wheezy-amd64-pvm-cn-north-1.yml} (100%) diff --git a/manifests/ec2-ebs-partitioned.manifest.yml b/manifests/ec2-ebs-partitioned.manifest.yml deleted file mode 100644 index 2cf1652..0000000 --- a/manifests/ec2-ebs-partitioned.manifest.yml +++ /dev/null @@ -1,28 +0,0 @@ ---- -provider: - name: ec2 - virtualization: pvm - # credentials: - # access-key: AFAKEACCESSKEYFORAWS - # secret-key: thes3cr3tkeyf0ryourawsaccount/FS4d8Qdva -bootstrapper: - workspace: /target -image: - name: debian-{system.release}-{system.architecture}-{provider.virtualization}-{%y}{%m}{%d} - description: Debian {system.release} {system.architecture} AMI ({provider.virtualization}) -system: - release: wheezy - architecture: amd64 - bootloader: pvgrub - charmap: UTF-8 - locale: en_US - timezone: UTC -volume: - backing: ebs - partitions: - type: msdos - root: - filesystem: ext4 - size: 1GiB -packages: - mirror: http://cloudfront.debian.net/debian diff --git a/manifests/ec2-ebs-single.manifest.yml b/manifests/ec2-ebs-single.manifest.yml deleted file mode 100644 index 25f1b1a..0000000 --- a/manifests/ec2-ebs-single.manifest.yml +++ /dev/null @@ -1,28 +0,0 @@ ---- -provider: - name: ec2 - virtualization: pvm - # credentials: - # access-key: AFAKEACCESSKEYFORAWS - # secret-key: thes3cr3tkeyf0ryourawsaccount/FS4d8Qdva -bootstrapper: - workspace: /target -image: - name: debian-{system.release}-{system.architecture}-{provider.virtualization}-{%y}{%m}{%d} - description: Debian {system.release} {system.architecture} AMI ({provider.virtualization}) -system: - release: wheezy - architecture: amd64 - bootloader: pvgrub - charmap: UTF-8 - locale: en_US - timezone: UTC -volume: - backing: ebs - partitions: - type: none - root: - filesystem: ext4 - size: 1GiB -packages: - mirror: http://cloudfront.debian.net/debian diff --git a/manifests/azure.manifest.yml b/manifests/examples/azure/wheezy.yml similarity index 100% rename from manifests/azure.manifest.yml rename to manifests/examples/azure/wheezy.yml diff --git a/manifests/ec2-ebs-debian-testing-amd64-pvm.manifest.yml b/manifests/examples/ec2/ebs-testing-amd64-pvm.yml similarity index 100% rename from manifests/ec2-ebs-debian-testing-amd64-pvm.manifest.yml rename to manifests/examples/ec2/ebs-testing-amd64-pvm.yml diff --git a/manifests/ec2-ebs-debian-unstable-contrib-amd64-pvm.manifest.yml b/manifests/examples/ec2/ebs-unstable-amd64-pvm-contrib.yml similarity index 100% rename from manifests/ec2-ebs-debian-unstable-contrib-amd64-pvm.manifest.yml rename to manifests/examples/ec2/ebs-unstable-amd64-pvm-contrib.yml diff --git a/manifests/ec2-ebs-debian-unstable-amd64-pvm.manifest.yml b/manifests/examples/ec2/ebs-unstable-amd64-pvm.yml similarity index 100% rename from manifests/ec2-ebs-debian-unstable-amd64-pvm.manifest.yml rename to manifests/examples/ec2/ebs-unstable-amd64-pvm.yml diff --git a/manifests/ec2-s3.manifest.yml b/manifests/examples/ec2/s3-wheezy-amd64-pvm.yml similarity index 100% rename from manifests/ec2-s3.manifest.yml rename to manifests/examples/ec2/s3-wheezy-amd64-pvm.yml diff --git a/manifests/gce-jessie-backports.manifest.yml b/manifests/examples/gce/jessie-backports.yml similarity index 100% rename from manifests/gce-jessie-backports.manifest.yml rename to manifests/examples/gce/jessie-backports.yml diff --git a/manifests/gce-jessie.manifest.yml b/manifests/examples/gce/jessie.yml similarity index 100% rename from manifests/gce-jessie.manifest.yml rename to manifests/examples/gce/jessie.yml diff --git a/manifests/gce-wheezy-backports.manifest.yml b/manifests/examples/gce/wheezy-backports.yml similarity index 100% rename from manifests/gce-wheezy-backports.manifest.yml rename to manifests/examples/gce/wheezy-backports.yml diff --git a/manifests/gce-wheezy.manifest.yml b/manifests/examples/gce/wheezy.yml similarity index 100% rename from manifests/gce-wheezy.manifest.yml rename to manifests/examples/gce/wheezy.yml diff --git a/manifests/kvm-virtio.manifest.yml b/manifests/examples/kvm/wheezy-virtio.yml similarity index 100% rename from manifests/kvm-virtio.manifest.yml rename to manifests/examples/kvm/wheezy-virtio.yml diff --git a/manifests/kvm.manifest.yml b/manifests/examples/kvm/wheezy.yml similarity index 100% rename from manifests/kvm.manifest.yml rename to manifests/examples/kvm/wheezy.yml diff --git a/manifests/virtualbox-vagrant.manifest.yml b/manifests/examples/virtualbox/wheezy-vagrant.yml similarity index 100% rename from manifests/virtualbox-vagrant.manifest.yml rename to manifests/examples/virtualbox/wheezy-vagrant.yml diff --git a/manifests/virtualbox.manifest.yml b/manifests/examples/virtualbox/wheezy.yml similarity index 100% rename from manifests/virtualbox.manifest.yml rename to manifests/examples/virtualbox/wheezy.yml diff --git a/manifests/official/README.rst b/manifests/official/README.rst new file mode 100644 index 0000000..e69de29 diff --git a/manifests/squeeze-ec2-ebs-debian-official-amd64-pvm.manifest.yml b/manifests/official/ec2/ebs-squeeze-amd64-pvm.yml similarity index 100% rename from manifests/squeeze-ec2-ebs-debian-official-amd64-pvm.manifest.yml rename to manifests/official/ec2/ebs-squeeze-amd64-pvm.yml diff --git a/manifests/squeeze-ec2-ebs-debian-official-i386-pvm.manifest.yml b/manifests/official/ec2/ebs-squeeze-i386-pvm.yml similarity index 100% rename from manifests/squeeze-ec2-ebs-debian-official-i386-pvm.manifest.yml rename to manifests/official/ec2/ebs-squeeze-i386-pvm.yml diff --git a/manifests/ec2-ebs-debian-official-amd64-hvm-cn-north-1.manifest.yml b/manifests/official/ec2/ebs-wheezy-amd64-hvm-cn-north-1.yml similarity index 100% rename from manifests/ec2-ebs-debian-official-amd64-hvm-cn-north-1.manifest.yml rename to manifests/official/ec2/ebs-wheezy-amd64-hvm-cn-north-1.yml diff --git a/manifests/ec2-ebs-debian-official-amd64-hvm.manifest.yml b/manifests/official/ec2/ebs-wheezy-amd64-hvm.yml similarity index 100% rename from manifests/ec2-ebs-debian-official-amd64-hvm.manifest.yml rename to manifests/official/ec2/ebs-wheezy-amd64-hvm.yml diff --git a/manifests/ec2-ebs-debian-official-amd64-pvm-cn-north-1.manifest.yml b/manifests/official/ec2/ebs-wheezy-amd64-pvm-cn-north-1.yml similarity index 100% rename from manifests/ec2-ebs-debian-official-amd64-pvm-cn-north-1.manifest.yml rename to manifests/official/ec2/ebs-wheezy-amd64-pvm-cn-north-1.yml diff --git a/manifests/ec2-ebs-debian-official-amd64-pvm.manifest.yml b/manifests/official/ec2/ebs-wheezy-amd64-pvm.yml similarity index 100% rename from manifests/ec2-ebs-debian-official-amd64-pvm.manifest.yml rename to manifests/official/ec2/ebs-wheezy-amd64-pvm.yml diff --git a/manifests/ec2-ebs-debian-official-i386-pvm.manifest.yml b/manifests/official/ec2/ebs-wheezy-i386-pvm.yml similarity index 100% rename from manifests/ec2-ebs-debian-official-i386-pvm.manifest.yml rename to manifests/official/ec2/ebs-wheezy-i386-pvm.yml diff --git a/manifests/ec2-s3-debian-official-amd64-pvm-cn-north-1.manifest.yml b/manifests/official/ec2/s3-wheezy-amd64-pvm-cn-north-1.yml similarity index 100% rename from manifests/ec2-s3-debian-official-amd64-pvm-cn-north-1.manifest.yml rename to manifests/official/ec2/s3-wheezy-amd64-pvm-cn-north-1.yml