Skip to content

Outscale inc & sas driver update #645

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
LordShion wants to merge 3 commits into from
Closed

Outscale inc & sas driver update #645

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
156a90f
Outscale Driver - region update (eu-west-2 , us-east-2)
LordShion Nov 27, 2015
608d54c
Outscale Driver - region update (eu-west-2 , us-east-2) on OUTSCALE_I…
LordShion Nov 27, 2015
d2b8169
Merge branch 'outscale_inc_driver_update' of github.com:LordShion/lib…
LordShion Nov 30, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGES.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -621,6 +621,9 @@ General
Compute
~~~~~~~

- Add new `eu-west-2` & `us-east-2` regions to the OUTSCALE_INC & OUTSCALE_SAS drivers.
[Filipe Silva /lordshion]

- GCE driver updated to include ex_stop_node() and ex_start_node() methods.
(GITHUB-442)
[Eric Johnson]
Expand Down
108 changes: 108 additions & 0 deletions libcloud/compute/drivers/ec2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1290,6 +1290,33 @@
'os1.8xlarge'
]
},
'eu-west-2': {
'endpoint': 'fcu.eu-west-2.outscale.com',
'api_name': 'osc_sas_eu_west_2',
'country': 'FRANCE',
'instance_types': [
't1.micro',
'm1.small',
'm1.medium',
'm1.large',
'm1.xlarge',
'c1.medium',
'c1.xlarge',
'm2.xlarge',
'm2.2xlarge',
'm2.4xlarge',
'nv1.small',
'nv1.medium',
'nv1.large',
'nv1.xlarge',
'cc1.4xlarge',
'cc2.8xlarge',
'm3.xlarge',
'm3.2xlarge',
'cr1.8xlarge',
'os1.8xlarge'
]
},
'us-east-1': {
'endpoint': 'api.us-east-1.outscale.com',
'api_name': 'osc_sas_us_east_1',
Expand All @@ -1316,6 +1343,33 @@
'cr1.8xlarge',
'os1.8xlarge'
]
},
'us-east-2': {
'endpoint': 'fcu.us-east-2.outscale.com',
'api_name': 'osc_sas_us_east_2',
'country': 'USA',
'instance_types': [
't1.micro',
'm1.small',
'm1.medium',
'm1.large',
'm1.xlarge',
'c1.medium',
'c1.xlarge',
'm2.xlarge',
'm2.2xlarge',
'm2.4xlarge',
'nv1.small',
'nv1.medium',
'nv1.large',
'nv1.xlarge',
'cc1.4xlarge',
'cc2.8xlarge',
'm3.xlarge',
'm3.2xlarge',
'cr1.8xlarge',
'os1.8xlarge'
]
}
}

Expand Down Expand Up @@ -1348,6 +1402,33 @@
'os1.8xlarge'
]
},
'eu-west-2': {
'endpoint': 'fcu.eu-west-2.outscale.com',
'api_name': 'osc_inc_eu_west_2',
'country': 'FRANCE',
'instance_types': [
't1.micro',
'm1.small',
'm1.medium',
'm1.large',
'm1.xlarge',
'c1.medium',
'c1.xlarge',
'm2.xlarge',
'm2.2xlarge',
'm2.4xlarge',
'nv1.small',
'nv1.medium',
'nv1.large',
'nv1.xlarge',
'cc1.4xlarge',
'cc2.8xlarge',
'm3.xlarge',
'm3.2xlarge',
'cr1.8xlarge',
'os1.8xlarge'
]
},
'eu-west-3': {
'endpoint': 'api-ppd.outscale.com',
'api_name': 'osc_inc_eu_west_3',
Expand Down Expand Up @@ -1401,6 +1482,33 @@
'cr1.8xlarge',
'os1.8xlarge'
]
},
'us-east-2': {
'endpoint': 'fcu.us-east-2.outscale.com',
'api_name': 'osc_inc_us_east_2',
'country': 'USA',
'instance_types': [
't1.micro',
'm1.small',
'm1.medium',
'm1.large',
'm1.xlarge',
'c1.medium',
'c1.xlarge',
'm2.xlarge',
'm2.2xlarge',
'm2.4xlarge',
'nv1.small',
'nv1.medium',
'nv1.large',
'nv1.xlarge',
'cc1.4xlarge',
'cc2.8xlarge',
'm3.xlarge',
'm3.2xlarge',
'cr1.8xlarge',
'os1.8xlarge'
]
}
}

Expand Down
88 changes: 88 additions & 0 deletions libcloud/data/pricing.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -671,6 +671,28 @@
"os1.8xlarge": "4.310",
"t1.micro": "0.040"
},
"osc_inc_eu_west_2": {
"c1.medium": "0.230",
"c1.xlarge": "0.900",
"cc1.4xlarge": "1.300",
"cc2.8xlarge": "2.400",
"cr1.8xlarge": "3.500",
"m1.large": "0.360",
"m1.medium": "0.120",
"m1.small": "0.090",
"m1.xlarge": "0.730",
"m2.2xlarge": "0.820",
"m2.4xlarge": "1.640",
"m2.xlarge": "0.410",
"m3.2xlarge": "1.560",
"m3.xlarge": "0.780",
"nv1.large": "5.490",
"nv1.medium": "5.250",
"nv1.small": "5.220",
"nv1.xlarge": "5.610",
"os1.8xlarge": "4.310",
"t1.micro": "0.040"
},
"osc_inc_eu_west_3": {
"c1.medium": "0.230",
"c1.xlarge": "0.900",
Expand Down Expand Up @@ -715,6 +737,28 @@
"os1.8xlarge": "6.400",
"t1.micro": "0.020"
},
"osc_inc_us_east_2": {
"c1.medium": "0.150",
"c1.xlarge": "0.580",
"cc1.4xlarge": "1.610",
"cc2.8xlarge": "2.400",
"cr1.8xlarge": "3.500",
"m1.large": "0.240",
"m1.medium": "0.180",
"m1.small": "0.060",
"m1.xlarge": "0.730",
"m2.2xlarge": "1.020",
"m2.4xlarge": "2.040",
"m2.xlarge": "0.410",
"m3.2xlarge": "1.560",
"m3.xlarge": "0.500",
"nv1.large": "5.490",
"nv1.medium": "5.250",
"nv1.small": "5.190",
"nv1.xlarge": "5.610",
"os1.8xlarge": "6.400",
"t1.micro": "0.020"
},
"osc_sas_eu_west_1": {
"c1.medium": "0.230",
"c1.xlarge": "0.900",
Expand All @@ -737,6 +781,28 @@
"os1.8xlarge": "6.400",
"t1.micro": "0.040"
},
"osc_sas_eu_west_2": {
"c1.medium": "0.230",
"c1.xlarge": "0.900",
"cc1.4xlarge": "1.460",
"cc2.8xlarge": "2.700",
"cr1.8xlarge": "3.750",
"m1.large": "0.360",
"m1.medium": "0.130",
"m1.small": "0.090",
"m1.xlarge": "0.730",
"m2.2xlarge": "0.920",
"m2.4xlarge": "1.840",
"m2.xlarge": "0.460",
"m3.2xlarge": "1.560",
"m3.xlarge": "0.780",
"nv1.large": "5.490",
"nv1.medium": "5.310",
"nv1.small": "5.220",
"nv1.xlarge": "5.860",
"os1.8xlarge": "6.400",
"t1.micro": "0.040"
},
"osc_sas_eu_west_3": {
"c1.medium": "0.230",
"c1.xlarge": "0.900",
Expand Down Expand Up @@ -781,6 +847,28 @@
"os1.8xlarge": "6.400",
"t1.micro": "0.020"
},
"osc_sas_us_east_2": {
"c1.medium": "0.170",
"c1.xlarge": "0.660",
"cc1.4xlarge": "1.610",
"cc2.8xlarge": "2.700",
"cr1.8xlarge": "3.750",
"m1.large": "0.260",
"m1.medium": "0.180",
"m1.small": "0.070",
"m1.xlarge": "0.730",
"m2.2xlarge": "1.020",
"m2.4xlarge": "2.040",
"m2.xlarge": "0.460",
"m3.2xlarge": "1.560",
"m3.xlarge": "0.550",
"nv1.large": "5.490",
"nv1.medium": "5.310",
"nv1.small": "5.220",
"nv1.xlarge": "5.860",
"os1.8xlarge": "6.400",
"t1.micro": "0.020"
},
"rackspace": {
"1": 0.015,
"2": 0.03,
Expand Down