From a1e17841d364063ed3417ea4cda9cac8765bb77f Mon Sep 17 00:00:00 2001 From: Anders Ingemann Date: Sat, 12 Jul 2014 19:58:25 +0200 Subject: [PATCH] Fix usage of virtualization reference in manifests --- .../ec2-ebs-debian-official-amd64-hvm-cn-north-1.manifest.yml | 2 +- manifests/ec2-ebs-debian-official-amd64-hvm.manifest.yml | 2 +- .../ec2-ebs-debian-official-amd64-pvm-cn-north-1.manifest.yml | 2 +- manifests/ec2-ebs-debian-official-amd64-pvm.manifest.yml | 2 +- manifests/ec2-ebs-debian-official-i386-pvm.manifest.yml | 2 +- manifests/ec2-ebs-debian-testing-amd64-pvm.manifest.yml | 2 +- manifests/ec2-ebs-debian-unstable-amd64-pvm.manifest.yml | 2 +- .../ec2-ebs-debian-unstable-contrib-amd64-pvm.manifest.yml | 2 +- manifests/ec2-ebs-partitioned.manifest.yml | 4 ++-- manifests/ec2-ebs-single.manifest.yml | 4 ++-- .../ec2-s3-debian-official-amd64-pvm-cn-north-1.manifest.yml | 2 +- manifests/ec2-s3.manifest.yml | 2 +- .../squeeze-ec2-ebs-debian-official-amd64-pvm.manifest.yml | 2 +- .../squeeze-ec2-ebs-debian-official-i386-pvm.manifest.yml | 2 +- 14 files changed, 16 insertions(+), 16 deletions(-) diff --git a/manifests/ec2-ebs-debian-official-amd64-hvm-cn-north-1.manifest.yml b/manifests/ec2-ebs-debian-official-amd64-hvm-cn-north-1.manifest.yml index 7ec2d57..83917a8 100644 --- a/manifests/ec2-ebs-debian-official-amd64-hvm-cn-north-1.manifest.yml +++ b/manifests/ec2-ebs-debian-official-amd64-hvm-cn-north-1.manifest.yml @@ -8,7 +8,7 @@ provider: bootstrapper: workspace: /target image: - name: debian-{system.release}-{system.architecture}-{virtualization}-{%Y}-{%m}-{%d}-ebs + name: debian-{system.release}-{system.architecture}-{provider.virtualization}-{%Y}-{%m}-{%d}-ebs description: Debian {system.release} {system.architecture} system: release: wheezy diff --git a/manifests/ec2-ebs-debian-official-amd64-hvm.manifest.yml b/manifests/ec2-ebs-debian-official-amd64-hvm.manifest.yml index ad5a030..ed10508 100644 --- a/manifests/ec2-ebs-debian-official-amd64-hvm.manifest.yml +++ b/manifests/ec2-ebs-debian-official-amd64-hvm.manifest.yml @@ -8,7 +8,7 @@ provider: bootstrapper: workspace: /target image: - name: debian-{system.release}-{system.architecture}-{virtualization}-{%Y}-{%m}-{%d}-ebs + name: debian-{system.release}-{system.architecture}-{provider.virtualization}-{%Y}-{%m}-{%d}-ebs description: Debian {system.release} {system.architecture} system: release: wheezy diff --git a/manifests/ec2-ebs-debian-official-amd64-pvm-cn-north-1.manifest.yml b/manifests/ec2-ebs-debian-official-amd64-pvm-cn-north-1.manifest.yml index 9de6156..2160e59 100644 --- a/manifests/ec2-ebs-debian-official-amd64-pvm-cn-north-1.manifest.yml +++ b/manifests/ec2-ebs-debian-official-amd64-pvm-cn-north-1.manifest.yml @@ -8,7 +8,7 @@ provider: bootstrapper: workspace: /target image: - name: debian-{system.release}-{system.architecture}-{virtualization}-{%Y}-{%m}-{%d}-ebs + name: debian-{system.release}-{system.architecture}-{provider.virtualization}-{%Y}-{%m}-{%d}-ebs description: Debian {system.release} {system.architecture} system: release: wheezy diff --git a/manifests/ec2-ebs-debian-official-amd64-pvm.manifest.yml b/manifests/ec2-ebs-debian-official-amd64-pvm.manifest.yml index 78d414e..1729377 100644 --- a/manifests/ec2-ebs-debian-official-amd64-pvm.manifest.yml +++ b/manifests/ec2-ebs-debian-official-amd64-pvm.manifest.yml @@ -8,7 +8,7 @@ provider: bootstrapper: workspace: /target image: - name: debian-{system.release}-{system.architecture}-{virtualization}-{%Y}-{%m}-{%d}-ebs + name: debian-{system.release}-{system.architecture}-{provider.virtualization}-{%Y}-{%m}-{%d}-ebs description: Debian {system.release} {system.architecture} system: release: wheezy diff --git a/manifests/ec2-ebs-debian-official-i386-pvm.manifest.yml b/manifests/ec2-ebs-debian-official-i386-pvm.manifest.yml index d6aabc8..360ed6d 100644 --- a/manifests/ec2-ebs-debian-official-i386-pvm.manifest.yml +++ b/manifests/ec2-ebs-debian-official-i386-pvm.manifest.yml @@ -8,7 +8,7 @@ provider: bootstrapper: workspace: /target image: - name: debian-{system.release}-{system.architecture}-{virtualization}-{%Y}-{%m}-{%d}-ebs + name: debian-{system.release}-{system.architecture}-{provider.virtualization}-{%Y}-{%m}-{%d}-ebs description: Debian {system.release} {system.architecture} system: release: wheezy diff --git a/manifests/ec2-ebs-debian-testing-amd64-pvm.manifest.yml b/manifests/ec2-ebs-debian-testing-amd64-pvm.manifest.yml index 6f66f07..7488073 100644 --- a/manifests/ec2-ebs-debian-testing-amd64-pvm.manifest.yml +++ b/manifests/ec2-ebs-debian-testing-amd64-pvm.manifest.yml @@ -8,7 +8,7 @@ provider: bootstrapper: workspace: /target image: - name: debian-{system.release}-{system.architecture}-{virtualization}-{%Y}-{%m}-{%d}-ebs + name: debian-{system.release}-{system.architecture}-{provider.virtualization}-{%Y}-{%m}-{%d}-ebs description: Debian {system.release} {system.architecture} system: release: testing diff --git a/manifests/ec2-ebs-debian-unstable-amd64-pvm.manifest.yml b/manifests/ec2-ebs-debian-unstable-amd64-pvm.manifest.yml index f7bb3ca..cf417a2 100644 --- a/manifests/ec2-ebs-debian-unstable-amd64-pvm.manifest.yml +++ b/manifests/ec2-ebs-debian-unstable-amd64-pvm.manifest.yml @@ -8,7 +8,7 @@ provider: bootstrapper: workspace: /target image: - name: debian-{system.release}-{system.architecture}-{virtualization}-{%Y}-{%m}-{%d}-ebs + name: debian-{system.release}-{system.architecture}-{provider.virtualization}-{%Y}-{%m}-{%d}-ebs description: Debian {system.release} {system.architecture} system: release: unstable diff --git a/manifests/ec2-ebs-debian-unstable-contrib-amd64-pvm.manifest.yml b/manifests/ec2-ebs-debian-unstable-contrib-amd64-pvm.manifest.yml index 9394c3c..f7f4935 100644 --- a/manifests/ec2-ebs-debian-unstable-contrib-amd64-pvm.manifest.yml +++ b/manifests/ec2-ebs-debian-unstable-contrib-amd64-pvm.manifest.yml @@ -8,7 +8,7 @@ provider: bootstrapper: workspace: /target image: - name: debian-{system.release}-{system.architecture}-{virtualization}-{%Y}-{%m}-{%d}-ebs + name: debian-{system.release}-{system.architecture}-{provider.virtualization}-{%Y}-{%m}-{%d}-ebs description: Debian {system.release} {system.architecture} system: release: unstable diff --git a/manifests/ec2-ebs-partitioned.manifest.yml b/manifests/ec2-ebs-partitioned.manifest.yml index 9cfc2fe..2cf1652 100644 --- a/manifests/ec2-ebs-partitioned.manifest.yml +++ b/manifests/ec2-ebs-partitioned.manifest.yml @@ -8,8 +8,8 @@ provider: bootstrapper: workspace: /target image: - name: debian-{system.release}-{system.architecture}-{virtualization}-{%y}{%m}{%d} - description: Debian {system.release} {system.architecture} AMI ({virtualization}) + 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 diff --git a/manifests/ec2-ebs-single.manifest.yml b/manifests/ec2-ebs-single.manifest.yml index d017eae..25f1b1a 100644 --- a/manifests/ec2-ebs-single.manifest.yml +++ b/manifests/ec2-ebs-single.manifest.yml @@ -8,8 +8,8 @@ provider: bootstrapper: workspace: /target image: - name: debian-{system.release}-{system.architecture}-{virtualization}-{%y}{%m}{%d} - description: Debian {system.release} {system.architecture} AMI ({virtualization}) + 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 diff --git a/manifests/ec2-s3-debian-official-amd64-pvm-cn-north-1.manifest.yml b/manifests/ec2-s3-debian-official-amd64-pvm-cn-north-1.manifest.yml index 708e6eb..6268883 100644 --- a/manifests/ec2-s3-debian-official-amd64-pvm-cn-north-1.manifest.yml +++ b/manifests/ec2-s3-debian-official-amd64-pvm-cn-north-1.manifest.yml @@ -11,7 +11,7 @@ provider: bootstrapper: workspace: /target image: - name: debian-{system.release}-{system.architecture}-{virtualization}-{%Y}-{%m}-{%d} + name: debian-{system.release}-{system.architecture}-{provider.virtualization}-{%Y}-{%m}-{%d} description: Debian {system.release} {system.architecture} AMI bucket: debian-amis-cn-north-1 region: cn-north-1 diff --git a/manifests/ec2-s3.manifest.yml b/manifests/ec2-s3.manifest.yml index 464fefe..bb837ff 100644 --- a/manifests/ec2-s3.manifest.yml +++ b/manifests/ec2-s3.manifest.yml @@ -11,7 +11,7 @@ provider: bootstrapper: workspace: /target image: - name: debian-{system.release}-{system.architecture}-{virtualization}-{%y}{%m}{%d} + name: debian-{system.release}-{system.architecture}-{provider.virtualization}-{%y}{%m}{%d} description: Debian {system.release} {system.architecture} AMI bucket: debian-amis region: us-west-1 diff --git a/manifests/squeeze-ec2-ebs-debian-official-amd64-pvm.manifest.yml b/manifests/squeeze-ec2-ebs-debian-official-amd64-pvm.manifest.yml index c175565..b36e832 100644 --- a/manifests/squeeze-ec2-ebs-debian-official-amd64-pvm.manifest.yml +++ b/manifests/squeeze-ec2-ebs-debian-official-amd64-pvm.manifest.yml @@ -8,7 +8,7 @@ provider: bootstrapper: workspace: /target image: - name: debian-{system.release}-{system.architecture}-{virtualization}-{%Y}-{%m}-{%d}-ebs + name: debian-{system.release}-{system.architecture}-{provider.virtualization}-{%Y}-{%m}-{%d}-ebs description: Debian {system.release} {system.architecture} system: release: squeeze diff --git a/manifests/squeeze-ec2-ebs-debian-official-i386-pvm.manifest.yml b/manifests/squeeze-ec2-ebs-debian-official-i386-pvm.manifest.yml index 1fb07b6..539c2d3 100644 --- a/manifests/squeeze-ec2-ebs-debian-official-i386-pvm.manifest.yml +++ b/manifests/squeeze-ec2-ebs-debian-official-i386-pvm.manifest.yml @@ -8,7 +8,7 @@ provider: bootstrapper: workspace: /target image: - name: debian-{system.release}-{system.architecture}-{virtualization}-{%Y}-{%m}-{%d}-ebs + name: debian-{system.release}-{system.architecture}-{provider.virtualization}-{%Y}-{%m}-{%d}-ebs description: Debian {system.release} {system.architecture} system: release: squeeze