Rename CfnCluster to AWS ParallelCluster

Signed-off-by: Enrico Usai <[email protected]>

Author: enrico-usai

.travis.yml

@@ -27,7 +27,7 @@ script:
   - if [[ $TRAVIS_PYTHON_VERSION != 2.6 ]]; then
     pip install 'boto3==1.7.84' --force-reinstall;
     pip install moto
-    python cli/tests/cfncluster-unittest.py;
+    python cli/tests/pcluster-unittest.py;
     pip install boto3 --upgrade;
     fi
   - sh tests/test.sh

CHANGELOG.rst

@@ -28,7 +28,7 @@ CHANGELOG
 1.5.2
 =====
 * feature:``cfncluster``: Added ClusterUser as a stack output. This makes it easier to get the username of the head node.
-* feature:``cfncluster``: Added `cfncluster ssh cluster_name`, this allows you to easily ssh into your clusters. It allows arbitrary command execution and extra ssh flags to be provided after the command. See https://cfncluster.readthedocs.io/en/latest/commands.html#ssh
+* feature:``cfncluster``: Added `cfncluster ssh cluster_name`, this allows you to easily ssh into your clusters. It allows arbitrary command execution and extra ssh flags to be provided after the command. See https://aws-parallelcluster.readthedocs.io/en/latest/commands.html#ssh
 * change:``cfncluster``: Moved global cli flags to the command specific flags. For example `cfncluster --region us-east-1 create` now becomes `cfncluster create --region us-east-1`
 * bugfix:``cfncluster-cookbook``: Fix bug that prevented c5d/m5d instances from working
 * bugfix:``cfncluster-cookbook``: Set CPU as a consumable resource in slurm
@@ -135,7 +135,7 @@ by incompatible dependencies.
 =====
 Offiical release of the CfnCluster 1.x CLI, templates and AMIs. Available in all regions except BJS, with
 support for Amazon Linux, CentOS 6 & 7 and Ubuntu 14.04 LTS. All AMIs are built via packer from the CfnCluster
-Cookbook project (https://github.com/awslabs/cfncluster-cookbook).
+Cookbook project (https://github.com/aws/aws-parallelcluster-cookbook).
 
 1.0.0-beta
 ==========

CONTRIBUTING.md

@@ -11,7 +11,7 @@ information to effectively respond to your bug report or contribution.
 
 We welcome you to use the GitHub issue tracker to report bugs or suggest features.
 
-When filing an issue, please check [existing open](https://github.com/awslabs/cfncluster/issues), or [recently closed](https://github.com/awslabs/cfncluster/issues?utf8=%E2%9C%93&q=is%3Aissue%20is%3Aclosed%20), issues to make sure somebody else hasn't already 
+When filing an issue, please check [existing open](https://github.com/aws/aws-parallelcluster/issues), or [recently closed](https://github.com/aws/aws-parallelcluster/issues?utf8=%E2%9C%93&q=is%3Aissue%20is%3Aclosed%20), issues to make sure somebody else hasn't already 
 reported the issue. Please try to include as much information as you can. Details like these are incredibly useful:
 
 * A reproducible test case or series of steps
@@ -41,7 +41,7 @@ GitHub provides additional document on [forking a repository](https://help.githu
 
 
 ## Finding contributions to work on
-Looking at the existing issues is a great way to find something to contribute on. As our projects, by default, use the default GitHub issue labels ((enhancement/bug/duplicate/help wanted/invalid/question/wontfix), looking at any ['help wanted'](https://github.com/awslabs/cfncluster/labels/help%20wanted) issues is a great place to start. 
+Looking at the existing issues is a great way to find something to contribute on. As our projects, by default, use the default GitHub issue labels ((enhancement/bug/duplicate/help wanted/invalid/question/wontfix), looking at any ['help wanted'](https://github.com/aws/aws-parallelcluster/labels/help%20wanted) issues is a great place to start. 
 
 
 ## Code of Conduct
@@ -56,6 +56,6 @@ If you discover a potential security issue in this project we ask that you notif
 
 ## Licensing
 
-See the [LICENSE](https://github.com/awslabs/cfncluster/blob/develop/LICENSE) file for our project's licensing. We will ask you to confirm the licensing of your contribution.
+See the [LICENSE](https://github.com/aws/aws-parallelcluster/blob/develop/LICENSE) file for our project's licensing. We will ask you to confirm the licensing of your contribution.
 
 We may ask you to sign a [Contributor License Agreement (CLA)](http://en.wikipedia.org/wiki/Contributor_License_Agreement) for larger changes.

NOTICE.txt

@@ -1,2 +1,2 @@
-cfncluster
-Copyright 2013-2014 Amazon.com, Inc. or its affiliates. All Rights Reserved. 
+aws-parallelcluster
+Copyright 2013-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.

README.rst

@@ -1,19 +1,19 @@
-==============================
-CfnCluster - HPC for the Cloud
-==============================
+=======================================
+AWS ParallelCluster - HPC for the Cloud
+=======================================
 
 |Build Status| |Version|
 
-.. |Build Status| image:: https://travis-ci.org/awslabs/cfncluster.png?branch=develop
-   :target: https://travis-ci.org/awslabs/cfncluster/
+.. |Build Status| image:: https://travis-ci.org/aws/aws-parallelcluster.png?branch=develop
+   :target: https://travis-ci.org/aws/aws-parallelcluster/
    :alt: Build Status
-.. |Version| image:: https://badge.fury.io/py/cfncluster.png
-    :target: https://badge.fury.io/py/cfncluster
+.. |Version| image:: https://badge.fury.io/py/aws-parallelcluster.png
+    :target: https://badge.fury.io/py/aws-parallelcluster
 
-CfnCluster ("cloud formation cluster") is a framework that deploys and
+AWS ParallelCluster 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
+(AWS). Developed by AWS, AWS ParallelCluster facilitates both quick start proof
+of concepts (POCs) and production deployments. AWS ParallelCluster 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.\
@@ -24,7 +24,7 @@ First, install the library:
 
 .. code-block:: sh
 
-    $ pip install cfncluster
+    $ pip install aws-parallelcluster
 
 Next, configure your aws credentials and default region:
 
@@ -36,11 +36,11 @@ Next, configure your aws credentials and default region:
     Default region name [us-east-1]:
     Default output format [None]:
 
-Then, run cfncluster configure:
+Then, run pcluster configure:
 
 .. code-block:: ini
 
-  $ cfncluster configure
+  $ pcluster configure
   Cluster Template [default]:
   AWS Access Key ID []:
   AWS Secret Access Key ID []:
@@ -69,14 +69,14 @@ Now you can create your first cluster;
 
 .. code-block:: sh
 
-  $ cfncluster create myfirstcluster
+  $ pcluster create myfirstcluster
 
 
 After the cluster finishes creating, log in:
 
 .. code-block:: sh
 
-  $ cfncluster ssh myfirstcluster
+  $ pcluster ssh myfirstcluster
 
 You can view the running compute hosts:
 
@@ -86,21 +86,21 @@ You can view the running compute hosts:
 
 For more information on any of these steps see the `Getting Started Guide`_.
 
-.. _`Getting Started Guide`: https://cfncluster.readthedocs.io/en/latest/getting_started.html
+.. _`Getting Started Guide`: https://aws-parallelcluster.readthedocs.io/en/latest/getting_started.html
 
 Documentation
 -------------
 
 Documentation is part of the project and is published to -
-https://cfncluster.readthedocs.io/. Of most interest to new users is
+https://aws-parallelcluster.readthedocs.io/. Of most interest to new users is
 the Getting Started Guide -
-https://cfncluster.readthedocs.io/en/latest/getting_started.html.
+https://aws-parallelcluster.readthedocs.io/en/latest/getting_started.html.
 
 Issues
 ------
 
 Please open a GitHub issue for any feedback or issues:
-https://github.com/awslabs/cfncluster.  There is also an active AWS
+https://github.com/aws/aws-parallelcluster.  There is also an active AWS
 HPC forum which may be helpful:https://forums.aws.amazon.com/forum.jspa?forumID=192.
 
 Changes
@@ -109,14 +109,14 @@ Changes
 CfnCluster 1.6 IAM Change
 =========================
 Between CfnCluster 1.5.4 and 1.6.0 we made a change to the CfnClusterInstancePolicy that adds “s3:GetObject” permissions
-on objects in <REGION>-cfncluster bucket, "autoscaling:SetDesiredCapacity", "autoscaling:DescribeTags" permissions and
-"cloudformation:DescribeStacks" permissions on <REGION>:<ACCOUNT_ID>:stack/cfncluster-*.
+on objects in <REGION>-aws-parallelcluster bucket, "autoscaling:SetDesiredCapacity", "autoscaling:DescribeTags" permissions and
+"cloudformation:DescribeStacks" permissions on <REGION>:<ACCOUNT_ID>:stack/aws-parallelcluster-*.
 
-If you’re using a custom policy (e.g. you specify "ec2_iam_role" in your config) be sure it includes this new permission. See https://cfncluster.readthedocs.io/en/latest/iam.html
+If you’re using a custom policy (e.g. you specify "ec2_iam_role" in your config) be sure it includes this new permission. See https://aws-parallelcluster.readthedocs.io/en/latest/iam.html
 
 CfnCluster 1.5 IAM Change
 =========================
-Between CfnCluster 1.4.2 and 1.5.0 we made a change to the CfnClusterInstancePolicy that adds “ec2:DescribeVolumes” permissions. If you’re using a custom policy (e.g. you specify "ec2_iam_role" in your config) be sure it includes this new permission. See https://cfncluster.readthedocs.io/en/latest/iam.html
+Between CfnCluster 1.4.2 and 1.5.0 we made a change to the CfnClusterInstancePolicy that adds “ec2:DescribeVolumes” permissions. If you’re using a custom policy (e.g. you specify "ec2_iam_role" in your config) be sure it includes this new permission. See https://aws-parallelcluster.readthedocs.io/en/latest/iam.html
 
 CfnCluster 1.2 and Earlier
 ==========================

cli/MANIFEST.in

@@ -1,3 +1,3 @@
-recursive-include cfncluster/cloudformation *
-recursive-include cfncluster/examples *
-recursive-include cfncluster/resources *
+recursive-include pcluster/cloudformation *
+recursive-include pcluster/examples *
+recursive-include pcluster/resources *

cli/README

@@ -1,10 +1,10 @@
-cfncluster is an example framework for launching clusters.
+pcluster is an example framework for launching clusters.
 
-    usage: cfncluster [-h]
+    usage: pcluster [-h]
                       {create,update,delete,start,stop,status,list,instances,ssh,configure,version}
                       ...
 
-    cfncluster is a tool to launch and manage a cluster.
+    pcluster is a tool to launch and manage a cluster.
 
     positional arguments:
       {create,update,delete,start,stop,status,list,instances,ssh,configure,version}
@@ -15,13 +15,13 @@ cfncluster is an example framework for launching clusters.
         stop                stop the compute fleet, but leave the master server
                             running for debugging/development
         status              pull the current status of the cluster
-        list                display a list of stacks associated with cfncluster
+        list                display a list of stacks associated with AWS ParallelCluster
         instances           display a list of all instances in a cluster
         ssh                 connect to the master server using SSH
-        configure           creating initial cfncluster configuration
-        version             display version of cfncluster
+        configure           creating initial pcluster configuration
+        version             display version of aws-parallelcluster
 
     optional arguments:
       -h, --help            show this help message and exit
 
-    For command specific flags run cfncluster [command] --help
+    For command specific flags run pcluster [command] --help

cli/awsbatch/common.py

@@ -105,25 +105,25 @@ def get_client(self, service):
 
 class AWSBatchCliConfig(object):
     """
-    CfnCluster AWS Batch CLI configuration object
+    AWS ParallelCluster AWS Batch CLI configuration object
     """
     def __init__(self, log, cluster):
         """
         The command will search for the [cluster cluster-name] section in the /etc/awsbatch-cli.cfg
-        configuration file, if there, or ask to the cfncluster status
+        configuration file, if there, or ask to the pcluster status
         :param log: log
         :param cluster: cluster name
         """
-        # Check if credentials and region have been provided in cfncluster config
+        # Check if credentials and region have been provided in parallelcluster config
         self.aws_access_key_id = None
         self.aws_secret_access_key = None
         self.region = None
-        cfncluster_config_file = os.path.expanduser(os.path.join('~', '.cfncluster', 'config'))
-        if os.path.isfile(cfncluster_config_file):
-            self.__init_from_cfncluster_config(cfncluster_config_file, log)
+        parallelcluster_config_file = os.path.expanduser(os.path.join('~', '.parallelcluster', 'config'))
+        if os.path.isfile(parallelcluster_config_file):
+            self.__init_from_parallelcluster_config(parallelcluster_config_file, log)
 
         # search for awsbatch-cli config
-        cli_config_file = os.path.expanduser(os.path.join('~', '.cfncluster', 'awsbatch-cli.cfg'))
+        cli_config_file = os.path.expanduser(os.path.join('~', '.parallelcluster', 'awsbatch-cli.cfg'))
         if os.path.isfile(cli_config_file):
             self.__init_from_config(cli_config_file, cluster, log)
         elif cluster:
@@ -152,27 +152,27 @@ def __verify_initialization(self, log):
             fail("Error getting cluster information from AWS CloudFormation."
                  "Missing attribute (%s) from the output CloudFormation stack." % e)
 
-    def __init_from_cfncluster_config(self, cfncluster_config_file, log):
+    def __init_from_parallelcluster_config(self, parallelcluster_config_file, log):
         """
-        init credentials object attributes from cfncluster configuration file
-        :param cfncluster_config_file: cfncluster config
+        init credentials object attributes from aws-parallelcluster configuration file
+        :param parallelcluster_config_file: aws-parallelcluster config
         :param log: log
         """
-        with open(cfncluster_config_file) as config_file:
-            cfncluster_config = ConfigParser()
-            cfncluster_config.read_file(config_file)
-            log.info("Looking for AWS credentials and region in the CfnCluster configuration file %s" %
-                     cfncluster_config_file)
+        with open(parallelcluster_config_file) as config_file:
+            parallelcluster_config = ConfigParser()
+            parallelcluster_config.read_file(config_file)
+            log.info("Looking for AWS credentials and region in the AWS ParallelCluster configuration file %s" %
+                     parallelcluster_config_file)
             try:
-                self.aws_access_key_id = cfncluster_config.get('aws', 'aws_access_key_id')
+                self.aws_access_key_id = parallelcluster_config.get('aws', 'aws_access_key_id')
             except (NoOptionError, NoSectionError):
                 pass
             try:
-                self.aws_secret_access_key = cfncluster_config.get('aws', 'aws_secret_access_key')
+                self.aws_secret_access_key = parallelcluster_config.get('aws', 'aws_secret_access_key')
             except (NoOptionError, NoSectionError):
                 pass
             try:
-                self.region = cfncluster_config.get('aws', 'aws_region_name')
+                self.region = parallelcluster_config.get('aws', 'aws_region_name')
             except (NoOptionError, NoSectionError):
                 pass
 
@@ -203,9 +203,9 @@ def __init_from_config(self, cli_config_file, cluster, log):
                 pass
 
             try:
-                self.stack_name = 'cfncluster-' + cluster_name
+                self.stack_name = 'aws-parallelcluster-' + cluster_name
                 log.info("Stack name is (%s)" % self.stack_name)
-                # if region is set for the current stack, override the region from the CfnCluster config file
+                # if region is set for the current stack, override the region from the AWS ParallelCluster config file
                 # or the region from the [main] section
                 self.region = config.get(cluster_section, 'region')
                 self.s3_bucket = config.get(cluster_section, 's3_bucket')
@@ -232,7 +232,7 @@ def __init_from_stack(self, cluster, log):
         :param log: log
         """
         try:
-            self.stack_name = 'cfncluster-' + cluster
+            self.stack_name = 'aws-parallelcluster-' + cluster
             log.info("Describing stack (%s)" % self.stack_name)
             # get required values from the output of the describe-stack command
             # don't use proxy because we are in the client and use default region
@@ -279,12 +279,12 @@ def __init_from_stack(self, cluster, log):
 
 def config_logger(log_level):
     """
-    Define a logger for cfncluster-awsbatch-cli
+    Define a logger for aws-parallelcluster-awsbatch-cli
     :param log_level logging level
     :return: the logger
     """
     try:
-        logfile = os.path.expanduser(os.path.join('~', '.cfncluster', 'awsbatch-cli.log'))
+        logfile = os.path.expanduser(os.path.join('~', '.parallelcluster', 'awsbatch-cli.log'))
         formatter = logging.Formatter('%(asctime)s %(levelname)s [%(module)s:%(funcName)s] %(message)s')
 
         logfile_handler = RotatingFileHandler(logfile, maxBytes=5*1024*1024, backupCount=1)

cli/awsbatch/examples/awsbatch-cli.cfg

@@ -1,4 +1,4 @@
-# cfncluster-awsbatch-cli configuration file
+# aws-parallelcluster-awsbatch-cli configuration file
 
 # This is an optional file.
 # 1. If the file doesn't exist, the CLI command will expect the --cluster parameter and
@@ -28,15 +28,15 @@ region = eu-west-1
 # S3 bucket used to temporary store user's script before execution in the compute instances
 s3_bucket = <s3-bucket-name>
 # Compute Environment ARN
-compute_environment = arn:aws:batch:<region>:<account-id>:compute-environment/cfncluster-<cluster-name>
+compute_environment = arn:aws:batch:<region>:<account-id>:compute-environment/aws-parallelcluster-<cluster-name>
 # Job Queue ARN on which submit the Jobs
-job_queue = arn:aws:batch:<region>:<account-id>:job-queue/cfncluster-<cluster-name>
+job_queue = arn:aws:batch:<region>:<account-id>:job-queue/aws-parallelcluster-<cluster-name>
 # Job Definition ARN used for standard job submission
-job_definition = arn:aws:batch:<region>:<account-id>:job-definition/cfncluster-<cluster-name>:1
+job_definition = arn:aws:batch:<region>:<account-id>:job-definition/aws-parallelcluster-<cluster-name>:1
 # HTTP(S) proxy server, typically http://x.x.x.x:8080, used for internal boto3 calls
 proxy = NONE
 # Private Master IP, used internally in the job submission phase.
 master_ip = x.x.x.x
 
-# NOTE: the CLI will also search for the credentials in the [aws] section of the CfnCluster config file
+# NOTE: the CLI will also search for the credentials in the [aws] section of the AWS ParallelCluster config file
 # If not defined, boto3 will attempt to use environment or EC2 IAM role.