diff --git a/inventory/host_vars/copr-be-dev.cloud.fedoraproject.org b/inventory/host_vars/copr-be-dev.cloud.fedoraproject.org index 6394ea23d0..4471310722 100644 --- a/inventory/host_vars/copr-be-dev.cloud.fedoraproject.org +++ b/inventory/host_vars/copr-be-dev.cloud.fedoraproject.org @@ -1,7 +1,6 @@ --- instance_type: m1.xlarge -#image: "{{ f20_qcow_id }}" -image: "Fedora-Cloud-Base-20141203-21.x86_64" +image: "{{ fedora21_x86_64 }}" keypair: fedora-admin-20130801 security_group: web-80-anywhere-persistent,web-443-anywhere-persistent,ssh-anywhere-persistent,default,allow-nagios-persistent zone: nova diff --git a/inventory/host_vars/copr-fe-dev.cloud.fedoraproject.org b/inventory/host_vars/copr-fe-dev.cloud.fedoraproject.org index 553c765237..093ee8afcb 100644 --- a/inventory/host_vars/copr-fe-dev.cloud.fedoraproject.org +++ b/inventory/host_vars/copr-fe-dev.cloud.fedoraproject.org @@ -1,6 +1,6 @@ --- instance_type: m1.medium -image: "Fedora-Cloud-Base-20141203-21" +image: "{{ fedora21_x86_64 }}" keypair: fedora-admin-20130801 security_group: web-80-anywhere-persistent,web-443-anywhere-persistent,ssh-anywhere-persistent,default zone: nova diff --git a/inventory/host_vars/taiga.cloud.fedoraproject.org b/inventory/host_vars/taiga.cloud.fedoraproject.org index dea688c846..0e51a21759 100644 --- a/inventory/host_vars/taiga.cloud.fedoraproject.org +++ b/inventory/host_vars/taiga.cloud.fedoraproject.org @@ -1,5 +1,5 @@ --- -image: Fedora-Cloud-Base-20141203-21.x86_64 +image: "{{ fedora21_x86_64 }}" instance_type: m1.medium keypair: fedora-admin-20130801 security_group: ssh-anywhere-persistent,web-80-anywhere-persistent diff --git a/vars/global.yml b/vars/global.yml index 0aade1e676..14567e7036 100644 --- a/vars/global.yml +++ b/vars/global.yml @@ -10,6 +10,9 @@ tasks: /srv/web/infra/ansible/tasks vars_path: "/srv/web/infra/ansible/vars" dist_tag: unknown auth_keys_from_fas: '/srv/web/infra/ansible/scripts/auth-keys-from-fas' +# +# These are images in the old cloud using the ec2 interface +# el6_qcow_id: ami-00000013 f18_qcow_id: ami-00000016 el6_ami_id: ami-0000000e @@ -25,6 +28,20 @@ el7b_qcow_id: ami-0000003f # RHEL7 el7_qcow_id: ami-00000050 +# +# These are the new images in the new cloud using the nova interface. +# +fedora20_x86_64: Fedora-x86_64-20-20140407 +fedora21_x86_64: Fedora-Cloud-Base-20141203-21.x86_64 +fedora22_alpha_x86_64: Fedora-Cloud-Base-22_Alpha-20150305.x86_64 +fedora22_beta_x86_64: Fedora-Cloud-Base-22_Beta-20150415.x86_64 +fedora_atomic_22_alpha: Fedora-Cloud-Base-22_Alpha-20150305.x86_64 +fedora_atomic_22_beta: Fedora-Cloud-Base-22_Beta-20150415.x86_64 +centos70_x86_64: CentOS-7-x86_64-GenericCloud-1503 +centos66_x86_64: CentOS-6-x86_64-GenericCloud-20141129_01 +rhel70_x86_64: rhel-guest-image-7.0-20140930.0.x86_64 +rhel66_x86_64: rhel-guest-image-6.6-20141222.0.x86_64 + # Set a default hostname base to transient. Override in host vars or command line. hostbase: transient global_pkgs_inst: ['bind-utils', 'mailx', 'nc', 'openssh-clients',