valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 00:55:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
Sean Channel 2013-01-28 13:53:08 -08:00
parent 225b274bc1
commit 4a4bf57de6
3 changed files with 76 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
conf/EC2-us-east-1.profiles
View File

@ -1,4 +1,4 @@
# Official distro images for Arch, Centos, Debian, Fedora, Ubuntu
# Official distro images for Arch, Centos, Debian, Fedora, FreeBSD, Ubuntu
# Arch Linux
# https://wiki.archlinux.org/index.php/Arch_Linux_AMIs_for_Amazon_Web_Services
@ -7,24 +7,22 @@ arch_aws:
image: ami-6ee95107
size: Micro Instance
os: Arch
ssh_username: ec2_user
ssh_username: root
location: us-east-1
minion:
grains:
where: us-east-1
cloud: ec2
cloud: ec2-us-east-1
arch_cloud-init_aws:
provider: aws
image: ami-596de730
size: Micro Instance
os: Arch
ssh_username: ec2_user
ssh_username: root
location: us-east-1
minion:
grains:
where: us-east-1
cloud: ec2
cloud: ec2-us-east-1
# Centos 6, available from aws marketplace for no-charge
centos_6
@ -36,8 +34,7 @@ centos_6
location: us-east-1
minion:
grains:
where: us-east-1
cloud: ec2
cloud: ec2-us-east-1
# official Debain, available at no-charge from aws marketplace:
# https://aws.amazon.com/marketplace/pp?sku=8fvdn95s5ev33cprr62nq3q7t
@ -50,8 +47,7 @@ debian_squeeze_aws:
location: us-east-1
minion:
grains:
where: us-east-1
cloud: ec2
cloud: ec2-us-east-1
# Fedora project cloud images
# https://fedoraproject.org/wiki/Cloud_images
@ -60,38 +56,48 @@ fedora_17_aws:
image: ami-2ea50247
size: Micro Instance
os: Fedora
ssh_username: ec2_user
ssh_username: ec2-user
location: us-east-1
minion:
grains:
where: us-east-1
cloud: ec2
cloud: ec2-us-east-1
fedora_18_aws:
provider: aws
image: ami-6145cc08
size: Micro Instance
os: Fedora
ssh_username: ec2_user
ssh_username: ec2-user
location: us-east-1
minion:
grains:
where: us-east-1
cloud: ec2
cloud: ec2-us-east-1
# FreeBSD 9.1
# http://www.daemonology.net/freebsd-on-ec2/
# this micro instance does not auto-populate SSH keys see above link
freebsd_91_aws:
provider: aws
image: ami-5339bb3a
size: Micro Instance
os: Freebsd
ssh_username: ec2_user
os: FreeBSD
ssh_username: ec2-user
location: us-east-1
minion:
grains:
where: us-east-1
cloud: ec2
cloud: ec2-us-east-1
freebsd_91_4XL_aws:
provider: aws
image: ami-79088510
size: Cluster Compute 4XL
os: FreeBSD
ssh_username: ec2-user
location: us-east-1
minion:
grains:
cloud: ec2-us-east-1
# Canonical Ubuntu LTS images
# http://cloud-images.ubuntu.com/releases/
@ -104,8 +110,7 @@ ubuntu_lucid_aws:
location: us-east-1
minion:
grains:
where: us-east-1
cloud: ec2
cloud: ec2-us-east-1
ubuntu_precise_aws:
provider: aws
@ -116,6 +121,5 @@ ubuntu_precise_aws:
location: us-east-1
minion:
grains:
where: us-east-1
cloud: ec2
cloud: ec2-us-east-1

43
conf/EC2-us-west-1.profiles
View File

@ -1,4 +1,4 @@
# Official distro images for Arch, Centos, Debian, Fedora, Ubuntu
# Official distro images for Arch, Centos, Debian, Fedora, FreeBSD, Ubuntu
# Arch Linux
# https://wiki.archlinux.org/index.php/Arch_Linux_AMIs_for_Amazon_Web_Services
@ -7,24 +7,22 @@ arch_aws:
image: ami-337d5b76
size: Micro Instance
os: Arch
ssh_username: ec2_user
ssh_username: root
location: us-west-1
minion:
grains:
where: us-west-1
cloud: ec2
cloud: ec2-us-west-1
arch_cloud-init_aws:
provider: aws
image: ami-6a5f7c2f
size: Micro Instance
os: Arch
ssh_username: ec2_user
ssh_username: root
location: us-west-1
minion:
grains:
where: us-west-1
cloud: ec2
cloud: ec2-us-west-1
# Centos 6, available from aws marketplace for no-charge
centos_6
@ -36,8 +34,7 @@ centos_6
location: us-west-1
minion:
grains:
where: us-west-1
cloud: ec2
cloud: ec2-us-west-1
# official Debain, available at no-charge from aws marketplace:
# https://aws.amazon.com/marketplace/pp?sku=8fvdn95s5ev33cprr62nq3q7t
@ -50,8 +47,7 @@ debian_squeeze_aws:
location: us-west-1
minion:
grains:
where: us-west-1
cloud: ec2
cloud: ec2-us-west-1
# Fedora project cloud images
# https://fedoraproject.org/wiki/Cloud_images
@ -60,38 +56,37 @@ fedora_17_aws:
image: ami-877e24c2
size: Micro Instance
os: Fedora
ssh_username: ec2_user
ssh_username: ec2-user
location: us-west-1
minion:
grains:
where: us-west-1
cloud: ec2
cloud: ec2-us-west-1
fedora_18_aws:
provider: aws
image: ami-0899b94d
size: Micro Instance
os: Fedora
ssh_username: ec2_user
ssh_username: ec2-user
location: us-west-1
minion:
grains:
where: us-west-1
cloud: ec2
cloud: ec2-us-west-1
# FreeBSD 9.1
# http://www.daemonology.net/freebsd-on-ec2/
# this micro instance does not auto-populate SSH keys see above link
freebsd_91_aws:
provider: aws
image: ami-4c8baa09
size: Micro Instance
os: Freebsd
ssh_username: ec2_user
os: FreeBSD
ssh_username: ec2-user
location: us-west-1
minion:
grains:
where: us-west-1
cloud: ec2
cloud: ec2-us-west-1
# Canonical Ubuntu LTS images
# http://cloud-images.ubuntu.com/releases/
@ -104,8 +99,7 @@ ubuntu_lucid_aws:
location: us-west-1
minion:
grains:
where: us-west-1
cloud: ec2
cloud: ec2-us-west-1
ubuntu_precise_aws:
provider: aws
@ -116,6 +110,5 @@ ubuntu_precise_aws:
location: us-west-1
minion:
grains:
where: us-west-1
cloud: ec2
cloud: ec2-us-west-1

54
conf/EC2-us-west-2.profiles
View File

@ -1,4 +1,4 @@
# Official distro images for Arch, Centos, Debian, Fedora, Ubuntu
# Official distro images for Arch, Centos, Debian, Fedora, FreeBSD, Ubuntu
# Arch Linux
# https://wiki.archlinux.org/index.php/Arch_Linux_AMIs_for_Amazon_Web_Services
@ -7,24 +7,22 @@ arch_aws:
image: ami-bcf77e8c
size: Micro Instance
os: Arch
ssh_username: ec2_user
ssh_username: root
location: us-west-2
minion:
grains:
where: us-west-2
cloud: ec2
cloud: ec2-us-west-2
arch_cloud-init_aws:
provider: aws
image: ami-6a5f7c2f
size: Micro Instance
os: Arch
ssh_username: ec2_user
ssh_username: root
location: us-west-2
minion:
grains:
where: us-west-2
cloud: ec2
cloud: ec2-us-west-2
# Centos 6, available from aws marketplace for no-charge
centos_6
@ -36,8 +34,7 @@ centos_6
location: us-west-2
minion:
grains:
where: us-west-2
cloud: ec2
cloud: ec2-us-west-2
# official Debain, available at no-charge from aws marketplace:
# https://aws.amazon.com/marketplace/pp?sku=8fvdn95s5ev33cprr62nq3q7t
@ -50,8 +47,7 @@ debian_squeeze_aws:
location: us-west-2
minion:
grains:
where: us-west-2
cloud: ec2
cloud: ec2-us-west-2
# Fedora project cloud images
# https://fedoraproject.org/wiki/Cloud_images
@ -60,38 +56,48 @@ fedora_17_aws:
image: ami-8e69e5be
size: Micro Instance
os: Fedora
ssh_username: ec2_user
ssh_username: ec2-user
location: us-west-2
minion:
grains:
where: us-west-2
cloud: ec2
cloud: ec2-us-west-2
fedora_18_aws:
provider: aws
image: ami-0266ed32
size: Micro Instance
os: Fedora
ssh_username: ec2_user
ssh_username: ec2-user
location: us-west-2
minion:
grains:
where: us-west-2
cloud: ec2
cloud: ec2-us-west-2
# FreeBSD 9.1
# http://www.daemonology.net/freebsd-on-ec2/
# this micro instance does not auto-populate SSH keys see above link
freebsd_91_aws:
provider: aws
image: ami-aa09819a
size: Micro Instance
os: Freebsd
ssh_username: ec2_user
os: FreeBSD
ssh_username: ec2-user
location: us-west-2
minion:
grains:
where: us-west-2
cloud: ec2
cloud: ec2-us-west-2
freebsd_91_4XL_aws:
provider: aws
image: ami-66169e56
size: Cluster Compute 4XL
os: FreeBSD
ssh_username: ec2-user
location: us-west-2
minion:
grains:
cloud: ec2-us-west-2
# Canonical Ubuntu LTS images
# http://cloud-images.ubuntu.com/releases/
@ -104,8 +110,7 @@ ubuntu_lucid_aws:
location: us-west-2
minion:
grains:
where: us-west-2
cloud: ec2
cloud: ec2-us-west-2
ubuntu_precise_aws:
provider: aws
@ -116,6 +121,5 @@ ubuntu_precise_aws:
location: us-west-2
minion:
grains:
where: us-west-2
cloud: ec2
cloud: ec2-us-west-2