From b628c1c565647954de478f4948849268f7bfd235 Mon Sep 17 00:00:00 2001 From: Dustin Kirkland Date: Sun, 31 Oct 2010 14:20:09 -0400 Subject: [PATCH] * usr/lib/byobu/ec2_cost, usr/share/byobu/ec2/rates.eu_ie, usr/share/byobu/ec2/rates.us_ca, usr/share/byobu/ec2/rates.us_va: - add ec2_cost support for t1.micro instances --- debian/changelog | 4 +++- usr/lib/byobu/ec2_cost | 4 +++- usr/share/byobu/ec2/rates.eu_ie | 2 +- usr/share/byobu/ec2/rates.us_ca | 2 +- usr/share/byobu/ec2/rates.us_va | 2 +- 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index d005a4b0..97c1447b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ byobu (3.7) unreleased; urgency=low - * UNRELEASED + * usr/lib/byobu/ec2_cost, usr/share/byobu/ec2/rates.eu_ie, + usr/share/byobu/ec2/rates.us_ca, usr/share/byobu/ec2/rates.us_va: + - add ec2_cost support for t1.micro instances -- Dustin Kirkland Thu, 21 Oct 2010 12:09:14 -0500 diff --git a/usr/lib/byobu/ec2_cost b/usr/lib/byobu/ec2_cost index 9bc855d0..c52380a4 100755 --- a/usr/lib/byobu/ec2_cost +++ b/usr/lib/byobu/ec2_cost @@ -39,7 +39,9 @@ cpu=$(grep -c "^processor.*:" /proc/cpuinfo) || cpu=1 mem=$(grep ^MemTotal /proc/meminfo | awk '{print $2}') # Guess this system's going rate, based on mem available (m* types) -if [ $mem -gt 64000000 ]; then +if [ $mem -lt 700000 ]; then + RATE=$T1_MICRO +elif [ $mem -gt 64000000 ]; then RATE=$M2_4XLARGE elif [ $mem -gt 32000000 ]; then RATE=$M2_2XLARGE diff --git a/usr/share/byobu/ec2/rates.eu_ie b/usr/share/byobu/ec2/rates.eu_ie index e005d3da..36c19627 100644 --- a/usr/share/byobu/ec2/rates.eu_ie +++ b/usr/share/byobu/ec2/rates.eu_ie @@ -10,4 +10,4 @@ M2_2XLARGE="1.34" M2_4XLARGE="2.68" C1_MEDIUM="0.19" C1_XLARGE="0.76" - +T1_MICRO="0.025" diff --git a/usr/share/byobu/ec2/rates.us_ca b/usr/share/byobu/ec2/rates.us_ca index c7866fba..272bf84c 100644 --- a/usr/share/byobu/ec2/rates.us_ca +++ b/usr/share/byobu/ec2/rates.us_ca @@ -10,4 +10,4 @@ M2_2XLARGE="1.34" M2_4XLARGE="2.68" C1_MEDIUM="0.19" C1_XLARGE="0.76" - +T1_MICRO="0.025" diff --git a/usr/share/byobu/ec2/rates.us_va b/usr/share/byobu/ec2/rates.us_va index 0c271536..d5a9e0b6 100644 --- a/usr/share/byobu/ec2/rates.us_va +++ b/usr/share/byobu/ec2/rates.us_va @@ -10,4 +10,4 @@ M2_2XLARGE="1.20" M2_4XLARGE="2.40" C1_MEDIUM="0.17" C1_XLARGE="0.68" - +T1_MICRO="0.02"