Skip to content

Updates to templates to match cfncluster-cookbook updates. #186

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

Merged
merged 15 commits into from
May 26, 2017
Merged

Updates to templates to match cfncluster-cookbook updates. #186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
d79e501
Update ami_development.rst
dougalb May 25, 2017
b44d908
Merge pull request #1 from dougalb/dougalb-doc-patch-1
dougalb May 25, 2017
59a0fe2
Fix start to set initial_size and min_size correctly
adamrb Oct 10, 2016
1722014
adding m4.16xlarge instance
veloduff Oct 11, 2016
a1c94d5
* Fixing p2 instance types. Fixes #143
Oct 17, 2016
b64372f
stage1 changes from futurize
dougalb Feb 9, 2017
91f58d6
Initial support for Python 3
dougalb Feb 9, 2017
061d4fd
Correcting version check for Python 2.6
dougalb Feb 9, 2017
918dc0d
Improving tests
dougalb Feb 9, 2017
ff794fb
Updated CHANGELOG.rst
dougalb Feb 9, 2017
1271e81
Adding Python 3.6 build
dougalb Feb 9, 2017
649bf95
Adding YAML version of the template. :-)
dougalb Apr 27, 2017
c92755e
Update ami_development.rst
dougalb May 25, 2017
212dda3
Merge branch 'develop' of https://github.com/dougalb/cfncluster into …
dougalb May 26, 2017
2e8b996
Updates to templates to match https://github.com/awslabs/cfncluster-c…
dougalb May 26, 2017
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
12 changes: 6 additions & 6 deletions cloudformation/cfncluster.cfn.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1865,12 +1865,12 @@
},
"CfnClusterVersions" : {
"default" : {
"cfncluster" : "cfncluster-1.3.1",
"cookbook" : "cfncluster-cookbook-1.3.0",
"chef" : "12.13.30",
"ridley" : "4.5.1",
"berkshelf" : "4.6.1",
"ami" : "201609030709"
"cfncluster" : "cfncluster-1.3.2",
"cookbook" : "cfncluster-cookbook-1.3.2",
"chef" : "12.19.36",
"ridley" : "5.1.0",
"berkshelf" : "5.6.4",
"ami" : "dev"
}
},
"AWSRegion2Capabilites" : {
Expand Down
16 changes: 8 additions & 8 deletions cloudformation/cfncluster.cfn.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ AWSTemplateFormatVersion: '2010-09-09'
Description: 'AWS CloudFormation Sample Template cfncluster.cfn.yaml: 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-201609030709 cfncluster-1.3.1'
if you create a stack from this template. Version: ami-dev cfncluster-1.3.2'

Metadata:
AWS::CloudFormation::Designer:
Expand Down Expand Up @@ -1173,12 +1173,12 @@ Mappings:
ubuntu1604: ami-870edfe7
CfnClusterVersions:
default:
ami: '201609030709'
berkshelf: 4.6.1
cfncluster: cfncluster-1.3.1
chef: 12.13.30
cookbook: cfncluster-cookbook-1.3.0
ridley: 4.5.1
ami: 'dev'
berkshelf: 5.6.4
cfncluster: cfncluster-1.3.2
chef: 12.19.36
cookbook: cfncluster-cookbook-1.3.2
ridley: 5.1.0
OSFeatures:
alinux:
RootDevice: /dev/xvda
Expand Down Expand Up @@ -3090,4 +3090,4 @@ Outputs:
Value:
Fn::GetAtt:
- MasterServer
- PublicIp
- PublicIp
3 changes: 2 additions & 1 deletion docs/source/ami_development.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Steps

This guide is written assuming your OS is Ubuntu 14.04. If you don't have an Ubuntu machine you can easily get an `EC2 instance <https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EC2_GetStarted.html>`_ running Ubuntu.

#. :code:`sudo apt-get install build-essential`
#. :code:`sudo apt-get -y install build-essential git`
#. Go to https://downloads.chef.io/chef-dk, grab the latest version for your OS and install.

For example:
Expand All @@ -36,6 +36,7 @@ This guide is written assuming your OS is Ubuntu 14.04. If you don't have an Ubu
sudo tar xf ~/go1.7.linux-amd64.tar.gz
echo 'export GOPATH=~/work' >> ~/.bashrc
echo 'export PATH=$GOPATH/bin:/usr/local/go/bin:$PATH' >> ~/.bashrc
. ~/.bashrc

#. Install packer from source

Expand Down