From 61532cff568c99ff9827ce17482287664ad7304c Mon Sep 17 00:00:00 2001 From: Seth Vidal Date: Mon, 4 Mar 2013 19:29:57 +0000 Subject: [PATCH] swap some inventory over to openstack setup basics for copr-fe and try out a new variable so we don't have to tracek openstack instance ids all over the place --- inventory/host_vars/209.132.184.114 | 11 ----------- inventory/host_vars/209.132.184.144 | 11 +++++++++++ .../host_vars/{209.132.184.120 => 209.132.184.146} | 0 inventory/inventory | 2 +- vars/global.yml | 6 +++++- 5 files changed, 17 insertions(+), 13 deletions(-) delete mode 100644 inventory/host_vars/209.132.184.114 create mode 100644 inventory/host_vars/209.132.184.144 rename inventory/host_vars/{209.132.184.120 => 209.132.184.146} (100%) diff --git a/inventory/host_vars/209.132.184.114 b/inventory/host_vars/209.132.184.114 deleted file mode 100644 index 2af92c669e..0000000000 --- a/inventory/host_vars/209.132.184.114 +++ /dev/null @@ -1,11 +0,0 @@ ---- -instance_type: m1.large -image: emi-68D638BF -keypair: admin -security_group: webserver -zone: fedoracloud -hostbase: copr-fe- -public_ip: 209.132.184.114 -root_auth_users: skvidal bkabrda ryanlerch pingou -description: copr frontend server -volumes: ['-d /dev/vdb vol-25FC4013'] diff --git a/inventory/host_vars/209.132.184.144 b/inventory/host_vars/209.132.184.144 new file mode 100644 index 0000000000..f98bc36066 --- /dev/null +++ b/inventory/host_vars/209.132.184.144 @@ -0,0 +1,11 @@ +--- +instance_type: m1.medium +image: ${el6_qcow_id} +keypair: fedora-admin +security_group: webserver +zone: nova +hostbase: copr-fe- +public_ip: 209.132.184.144 +root_auth_users: skvidal bkabrda ryanlerch pingou +description: copr frontend server +volumes: ['-d /dev/vdb vol-0000000f'] diff --git a/inventory/host_vars/209.132.184.120 b/inventory/host_vars/209.132.184.146 similarity index 100% rename from inventory/host_vars/209.132.184.120 rename to inventory/host_vars/209.132.184.146 diff --git a/inventory/inventory b/inventory/inventory index 9e21b86818..435917c514 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -314,7 +314,7 @@ virthost-comm01.qa.fedoraproject.org #fedocal.dev.fedoraproject.org 209.132.184.113 #copr-fe.cloud.fedoraproject.org -209.132.184.114 +209.132.184.144 #artboard.cloud.fedoraproject.org 209.132.184.143 #elections-dev.cloud.fedoraproject.org diff --git a/vars/global.yml b/vars/global.yml index 2249b3ac56..09685732b8 100644 --- a/vars/global.yml +++ b/vars/global.yml @@ -8,4 +8,8 @@ vars: /srv/web/infra/ansible/vars is_fedora: "'$ansible_distribution' == 'Fedora'" is_rhel: "'$ansible_distribution' == 'RedHat'" dist_tag: unknown -auth_keys_from_fas: '/srv/web/infra/ansible/scripts/auth-keys-from-fas' \ No newline at end of file +auth_keys_from_fas: '/srv/web/infra/ansible/scripts/auth-keys-from-fas' +el6_qcow_id: ami-00000013 +f18_qcow_id: ami-00000016 +el6_ami_id: ami-0000000e +f17_qcow_id: ami-00000001