Skip to content

Commit e80cc30

Browse files
dougalbdougalb
committed
Merge branch 'release-1.2.1'
2 parents 770d313 + 0e59c7f commit e80cc30

12 files changed

+143
-92
lines changed

‎.travis.yml

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
language: python
2+
3+
python:
4+
- "2.6"
5+
- "2.7"
6+
- "3.3"
7+
- "3.4"
8+
- "3.5"
9+
10+
install:
11+
- cd cli
12+
- if [[ $TRAVIS_PYTHON_VERSION == 2.6 ]];
13+
then pip install -r requirements26.txt;
14+
else pip install -r requirements.txt;
15+
fi
16+
- pip install -e .
17+
- cd -
18+
19+
sudo: false
20+
21+
script: sh tests/test.sh

‎CHANGELOG.rst

+13
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,19 @@
22
CHANGELOG
33
=========
44

5+
1.2.1
6+
=====
7+
* bugfix:``cfncluster-node``: Use strings in command for sqswatcher on Python 2.6
8+
* updates:``ami``: Update all base AMIs to latest patch levels
9+
10+
1.2.0
11+
=====
12+
* bugfix:``cfncluster-node``: Correctly set slots per host for Openlava
13+
* updates:``cfncluster-cookbook``: Updated to cfncluster-cookbook-1.2.0
14+
* updates:``ami``: Updated to SGE 8.1.9
15+
* updates:``ami``: Updated to Openlava 3.1.3
16+
* updates:``ami``: Updated to Chef 12.8.1
17+
518
1.1.0
619
=====
720
* feature:``cfncluster``: Support for dynamic placement groups

‎README.rst

+4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
cfncluster
22
==========
33

4+
.. image:: https://travis-ci.org/awslabs/cfncluster.png?branch=develop
5+
:target: https://travis-ci.org/awslabs/cfncluster
6+
:alt: Build Status
7+
48
CfnCluster ("cloud formation cluster") is a framework that deploys and maintains high performance computing clusters on Amazon Web Services (AWS). Developed by AWS, CfnCluster facilitates both quick start proof of concepts (POCs) and production deployments. CfnCluster supports many different types of clustered applications and can easily be extended to support different frameworks. The CLI is stateless, everything is done using CloudFormation or resources within AWS.
59

610
Documentation

‎amis.txt

+40-40
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,44 @@
11
# centos6
2-
ap-northeast-1: ami-4540402b
3-
ap-northeast-2: ami-bb29e7d5
4-
ap-southeast-1: ami-00ce0763
5-
ap-southeast-2: ami-d17c5ab2
6-
eu-central-1: ami-e53d2789
7-
eu-west-1: ami-6aba0719
8-
sa-east-1: ami-192fac75
9-
us-east-1: ami-ac7343c6
10-
us-west-1: ami-3f8ffe5f
11-
us-west-2: ami-6c46a50c
2+
ap-northeast-1: ami-3b809555
3+
ap-northeast-2: ami-0ea26b60
4+
ap-southeast-1: ami-2b945e48
5+
ap-southeast-2: ami-20b99943
6+
eu-central-1: ami-1ee90f71
7+
eu-west-1: ami-b30a8ec0
8+
sa-east-1: ami-12b8347e
9+
us-east-1: ami-a8535cc2
10+
us-west-1: ami-6ac2b00a
11+
us-west-2: ami-e5b25985
1212
# centos7
13-
ap-northeast-1: ami-2c424242
14-
ap-northeast-2: ami-df27e9b1
15-
ap-southeast-1: ami-4cc0092f
16-
ap-southeast-2: ami-b17b5dd2
17-
eu-central-1: ami-45302a29
18-
eu-west-1: ami-b5bb06c6
19-
sa-east-1: ami-162caf7a
20-
us-east-1: ami-d77343bd
21-
us-west-1: ami-128ffe72
22-
us-west-2: ami-5447a434
13+
ap-northeast-1: ami-f284919c
14+
ap-northeast-2: ami-79a06917
15+
ap-southeast-1: ami-87945ee4
16+
ap-southeast-2: ami-cfba9aac
17+
eu-central-1: ami-1fe90f70
18+
eu-west-1: ami-2d0e8a5e
19+
sa-east-1: ami-20b63a4c
20+
us-east-1: ami-7c555a16
21+
us-west-1: ami-18d8aa78
22+
us-west-2: ami-148b6074
2323
# alinux
24-
ap-northeast-1: ami-824646ec
25-
ap-northeast-2: ami-ec2be582
26-
ap-southeast-1: ami-b0ce07d3
27-
ap-southeast-2: ami-cb7d5ba8
28-
eu-central-1: ami-a6302aca
29-
eu-west-1: ami-0ab70a79
30-
sa-east-1: ami-472caf2b
31-
us-east-1: ami-9c7646f6
32-
us-west-1: ami-898ffee9
33-
us-west-2: ami-b347a4d3
24+
ap-northeast-1: ami-5c839632
25+
ap-northeast-2: ami-85a069eb
26+
ap-southeast-1: ami-ef955f8c
27+
ap-southeast-2: ami-9fb999fc
28+
eu-central-1: ami-48f71127
29+
eu-west-1: ami-6a0e8a19
30+
sa-east-1: ami-24bf3348
31+
us-east-1: ami-1d585777
32+
us-west-1: ami-1dd8aa7d
33+
us-west-2: ami-5ab15a3a
3434
# ubuntu1404
35-
ap-northeast-1: ami-5245453c
36-
ap-northeast-2: ami-5c2ae432
37-
ap-southeast-1: ami-cdc20bae
38-
ap-southeast-2: ami-f97b5d9a
39-
eu-central-1: ami-a8302ac4
40-
eu-west-1: ami-1cb70a6f
41-
sa-east-1: ami-1632b17a
42-
us-east-1: ami-f3764699
43-
us-west-1: ami-bf8effdf
44-
us-west-2: ami-534ba833
35+
ap-northeast-1: ami-5d839633
36+
ap-northeast-2: ami-30a36a5e
37+
ap-southeast-1: ami-72945e11
38+
ap-southeast-2: ami-c7ba9aa4
39+
eu-central-1: ami-38e80e57
40+
eu-west-1: ami-7b088c08
41+
sa-east-1: ami-97b73bfb
42+
us-east-1: ami-7a585710
43+
us-west-1: ami-0bdeac6b
44+
us-west-2: ami-f2bf5492

‎cli/requirements.txt

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
boto>=2.39

‎cli/requirements26.txt

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
boto>=2.39
2+
argparse>=1.1

‎cli/setup.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ def read(fname):
2020
return open(os.path.join(os.path.dirname(__file__), fname)).read()
2121

2222
console_scripts = ['cfncluster = cfncluster.cli:main']
23-
version = "1.1.1"
24-
requires = ['boto>=2.39']
23+
version = "1.2.1"
24+
requires = ['boto>=2.39', 'awscli>=1.10.13']
2525

2626
if sys.version_info[:2] == (2, 6):
2727
# For python2.6 we have to require argparse since it

‎cloudformation/cfncluster.cfn.json

+47-47
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"AWSTemplateFormatVersion" : "2010-09-09",
3-
"Description" : "AWS CloudFormation Sample Template cfncluster.cfn.json: Sample template showing an framework for deploying master + compute type clusters on AWS. **WARNING** This template creates AWS resources. You will be billed for the AWS resources used if you create a stack from this template. Version: ami-201602192042 cfncluster-1.1.0",
3+
"Description" : "AWS CloudFormation Sample Template cfncluster.cfn.json: Sample template showing an framework for deploying master + compute type clusters on AWS. **WARNING** This template creates AWS resources. You will be billed for the AWS resources used if you create a stack from this template. Version: ami-201603231645 cfncluster-1.2.1",
44
"Parameters" : {
55
"KeyName" : {
66
"Description" : "Name of an existing EC2 KeyPair to enable SSH access to the instances",
@@ -998,58 +998,58 @@
998998
},
999999
"AWSRegionOS2AMI" : {
10001000
"eu-west-1" : {
1001-
"centos6" : "ami-6aba0719",
1002-
"centos7" : "ami-b5bb06c6",
1003-
"alinux" : "ami-0ab70a79",
1004-
"ubuntu1404" : "ami-1cb70a6f"
1001+
"centos6" : "ami-b30a8ec0",
1002+
"centos7" : "ami-2d0e8a5e",
1003+
"alinux" : "ami-6a0e8a19",
1004+
"ubuntu1404" : "ami-7b088c08"
10051005
},
10061006
"us-west-2" : {
1007-
"centos6" : "ami-6c46a50c",
1008-
"centos7" : "ami-5447a434",
1009-
"alinux" : "ami-b347a4d3",
1010-
"ubuntu1404" : "ami-534ba833"
1007+
"centos6" : "ami-e5b25985",
1008+
"centos7" : "ami-148b6074",
1009+
"alinux" : "ami-5ab15a3a",
1010+
"ubuntu1404" : "ami-f2bf5492"
10111011
},
10121012
"eu-central-1" : {
1013-
"centos6" : "ami-e53d2789",
1014-
"centos7" : "ami-45302a29",
1015-
"alinux" : "ami-a6302aca",
1016-
"ubuntu1404" : "ami-a8302ac4"
1013+
"centos6" : "ami-1ee90f71",
1014+
"centos7" : "ami-1fe90f70",
1015+
"alinux" : "ami-48f71127",
1016+
"ubuntu1404" : "ami-38e80e57"
10171017
},
10181018
"sa-east-1" : {
1019-
"centos6" : "ami-192fac75",
1020-
"centos7" : "ami-162caf7a",
1021-
"alinux" : "ami-472caf2b",
1022-
"ubuntu1404" : "ami-1632b17a"
1019+
"centos6" : "ami-12b8347e",
1020+
"centos7" : "ami-20b63a4c",
1021+
"alinux" : "ami-24bf3348",
1022+
"ubuntu1404" : "ami-97b73bfb"
10231023
},
10241024
"ap-northeast-1" : {
1025-
"centos6" : "ami-4540402b",
1026-
"centos7" : "ami-2c424242",
1027-
"alinux" : "ami-824646ec",
1028-
"ubuntu1404" : "ami-5245453c"
1025+
"centos6" : "ami-3b809555",
1026+
"centos7" : "ami-f284919c",
1027+
"alinux" : "ami-5c839632",
1028+
"ubuntu1404" : "ami-5d839633"
10291029
},
10301030
"us-east-1" : {
1031-
"centos6" : "ami-ac7343c6",
1032-
"centos7" : "ami-d77343bd",
1033-
"alinux" : "ami-9c7646f6",
1034-
"ubuntu1404" : "ami-f3764699"
1031+
"centos6" : "ami-a8535cc2",
1032+
"centos7" : "ami-7c555a16",
1033+
"alinux" : "ami-1d585777",
1034+
"ubuntu1404" : "ami-7a585710"
10351035
},
10361036
"us-west-1" : {
1037-
"centos6" : "ami-3f8ffe5f",
1038-
"centos7" : "ami-128ffe72",
1039-
"alinux" : "ami-898ffee9",
1040-
"ubuntu1404" : "ami-bf8effdf"
1037+
"centos6" : "ami-6ac2b00a",
1038+
"centos7" : "ami-18d8aa78",
1039+
"alinux" : "ami-1dd8aa7d",
1040+
"ubuntu1404" : "ami-0bdeac6b"
10411041
},
10421042
"ap-southeast-2" : {
1043-
"centos6" : "ami-d17c5ab2",
1044-
"centos7" : "ami-b17b5dd2",
1045-
"alinux" : "ami-cb7d5ba8",
1046-
"ubuntu1404" : "ami-f97b5d9a"
1043+
"centos6" : "ami-20b99943",
1044+
"centos7" : "ami-cfba9aac",
1045+
"alinux" : "ami-9fb999fc",
1046+
"ubuntu1404" : "ami-c7ba9aa4"
10471047
},
10481048
"ap-southeast-1" : {
1049-
"centos6" : "ami-00ce0763",
1050-
"centos7" : "ami-4cc0092f",
1051-
"alinux" : "ami-b0ce07d3",
1052-
"ubuntu1404" : "ami-cdc20bae"
1049+
"centos6" : "ami-2b945e48",
1050+
"centos7" : "ami-87945ee4",
1051+
"alinux" : "ami-ef955f8c",
1052+
"ubuntu1404" : "ami-72945e11"
10531053
},
10541054
"us-gov-west-1" : {
10551055
"centos6" : "NA",
@@ -1058,10 +1058,10 @@
10581058
"ubuntu1404" : "NA"
10591059
},
10601060
"ap-northeast-2" : {
1061-
"centos6" : "ami-bb29e7d5",
1062-
"centos7" : "ami-df27e9b1",
1063-
"alinux" : "ami-ec2be582",
1064-
"ubuntu1404" : "ami-5c2ae432"
1061+
"centos6" : "ami-0ea26b60",
1062+
"centos7" : "ami-79a06917",
1063+
"alinux" : "ami-85a069eb",
1064+
"ubuntu1404" : "ami-30a36a5e"
10651065
}
10661066
},
10671067
"OSFeatures" : {
@@ -1084,12 +1084,12 @@
10841084
},
10851085
"CfnClusterVersions" : {
10861086
"default" : {
1087-
"cfncluster" : "cfncluster-1.1.0",
1088-
"cookbook" : "cfncluster-cookbook-1.1.0",
1089-
"chef" : "12.4.3",
1090-
"ridley" : "4.3.2",
1091-
"berkshelf" : "4.0.1",
1092-
"ami" : "201602192042"
1087+
"cfncluster" : "cfncluster-1.2.1",
1088+
"cookbook" : "cfncluster-cookbook-1.2.1",
1089+
"chef" : "12.8.1",
1090+
"ridley" : "4.5.0",
1091+
"berkshelf" : "4.3.0",
1092+
"ami" : "201603231645"
10931093
}
10941094
},
10951095
"AWSRegion2Capabilites" : {

‎docs/source/conf.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@
5050
# built documents.
5151
#
5252
# The short X.Y version.
53-
version = '1.0'
53+
version = '1.2'
5454
# The full version, including alpha/beta/rc tags.
55-
release = '1.0.1'
55+
release = '1.2.1'
5656

5757
# The language for content autogenerated by Sphinx. Refer to documentation
5858
# for a list of supported languages.

‎docs/source/configuration.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ base_os
285285
"""""""
286286
OS type used in the cluster
287287

288-
Defaults to alinux in the default template. ::
288+
Defaults to alinux in the default template. Available options are: alinux, centos6, centos7, ubuntu1404::
289289

290290
base_os = alinux
291291

‎tests/install.sh

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
env
2+
cd cli
3+
pip install -r requirements.txt
4+
pip install -e .

‎tests/test.sh

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#!/bin/bash
2+
# Very basic first tests
3+
4+
set -x
5+
echo $PATH
6+
which cfncluster

0 commit comments

Comments
 (0)