Skip to content

Commit ffaf3ff

Browse files
Enrico Usaisean-smith
authored andcommitted
Rename CfnCluster to AWS ParallelCluster
+ change package name from cfncluster-node to aws-parallelcluster-node + change folder from /opt/cfncluster to /opt/parallelcluster + change event messages from cfncluster to parallelcluster + change github repos from awslabs/cfncluster-* to aws/aws-parallelcluster-* Signed-off-by: Enrico Usai <[email protected]>
1 parent fea0c19 commit ffaf3ff

File tree

9 files changed

+36
-35
lines changed

9 files changed

+36
-35
lines changed

CHANGELOG.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
cfncluster-node CHANGELOG
2-
=========================
1+
aws-parallelcluster-node CHANGELOG
2+
===================================
33

4-
This file is used to list changes made in each version of the cfncluster-node package.
4+
This file is used to list changes made in each version of the aws-parallelcluster-node package.
55

66
1.6.0
77
-----

CONTRIBUTING.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ information to effectively respond to your bug report or contribution.
1111

1212
We welcome you to use the GitHub issue tracker to report bugs or suggest features.
1313

14-
When filing an issue, please check [existing open](https://github.com/awslabs/cfncluster-node/issues), or [recently closed](https://github.com/awslabs/cfncluster-node/issues?utf8=%E2%9C%93&q=is%3Aissue%20is%3Aclosed%20), issues to make sure somebody else hasn't already
14+
When filing an issue, please check [existing open](https://github.com/aws/aws-parallelcluster-node/issues), or [recently closed](https://github.com/aws/aws-parallelcluster-node/issues?utf8=%E2%9C%93&q=is%3Aissue%20is%3Aclosed%20), issues to make sure somebody else hasn't already
1515
reported the issue. Please try to include as much information as you can. Details like these are incredibly useful:
1616

1717
* A reproducible test case or series of steps
@@ -41,7 +41,7 @@ GitHub provides additional document on [forking a repository](https://help.githu
4141

4242

4343
## Finding contributions to work on
44-
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-node/labels/help%20wanted) issues is a great place to start.
44+
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-node/labels/help%20wanted) issues is a great place to start.
4545

4646

4747
## Code of Conduct
@@ -56,6 +56,6 @@ If you discover a potential security issue in this project we ask that you notif
5656

5757
## Licensing
5858

59-
See the [LICENSE](https://github.com/awslabs/cfncluster-node/blob/develop/LICENSE) file for our project's licensing. We will ask you to confirm the licensing of your contribution.
59+
See the [LICENSE](https://github.com/aws/aws-parallelcluster-node/blob/develop/LICENSE) file for our project's licensing. We will ask you to confirm the licensing of your contribution.
6060

6161
We may ask you to sign a [Contributor License Agreement (CLA)](http://en.wikipedia.org/wiki/Contributor_License_Agreement) for larger changes.

NOTICE.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
cfncluster-node
2-
Copyright 2014-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
1+
aws-parallelcluster-node
2+
Copyright 2014-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.

README.rst

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
===============
2-
cfncluster-node
3-
===============
1+
=========================
2+
aws-parallelcluster-node
3+
=========================
44

5-
.. image:: https://travis-ci.org/awslabs/cfncluster-node.png?branch=develop
6-
:target: https://travis-ci.org/awslabs/cfncluster-node
5+
.. image:: https://travis-ci.org/aws/aws-parallelcluster-node.png?branch=develop
6+
:target: https://travis-ci.org/aws/aws-parallelcluster-node
77
:alt: Build Status
88

9-
cfncluster-node is the python package installed on the Amazon EC2 instances launched as part of CfnCluster.
9+
aws-parallelcluster-node is the python package installed on the Amazon EC2 instances launched as part of AWS ParallelCluster.

jobwatcher/jobwatcher.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
from botocore.config import Config
2525

2626
log = logging.getLogger(__name__)
27-
pricing_file = '/opt/cfncluster/instances.json'
28-
cfnconfig_file = '/opt/cfncluster/cfnconfig'
27+
pricing_file = '/opt/parallelcluster/instances.json'
28+
cfnconfig_file = '/opt/parallelcluster/cfnconfig'
2929

3030

3131
def load_scheduler_module(scheduler):
@@ -112,12 +112,13 @@ def fetch_pricing_file(proxy_config, cfncluster_dir, region):
112112
except OSError as ex:
113113
log.critical('Could not create directory %s. Failed with exception: %s' % (cfncluster_dir, ex))
114114
raise
115-
bucket_name = '%s-cfncluster' % region
115+
bucket_name = '%s-aws-parallelcluster' % region
116116
try:
117117
bucket = s3.Bucket(bucket_name)
118118
bucket.download_file('instances/instances.json', '%s/instances.json' % cfncluster_dir)
119119
except ClientError as e:
120-
log.critical("Could not save instance mapping file %s/instances.json from S3 bucket %s. Failed with exception: %s" % (cfncluster_dir, bucket_name, e))
120+
log.critical("Could not save instance mapping file %s/instances.json from S3 bucket %s. "
121+
"Failed with exception: %s" % (cfncluster_dir, bucket_name, e))
121122
raise
122123

123124

jobwatcher/plugins/test.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ def get_busy_nodes(instance_properties):
3131
def nodes(slots, instance_properties):
3232
if slots <= 0:
3333
return 0
34-
with open('/opt/cfncluster/instances.json') as f:
34+
with open('/opt/parallelcluster/instances.json') as f:
3535
instances = json.load(f)
3636
vcpus = int(instances[instance_type]["vcpus"])
3737
log.info("Instance %s has %s slots." % (instance_type, vcpus))

setup.py

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -38,22 +38,22 @@ def read(fname):
3838
requires.append('paramiko>=2.4.2')
3939

4040
setup(
41-
name = "cfncluster-node",
42-
version = version,
43-
author = "Dougal Ballantyne",
44-
author_email = "[email protected]",
45-
description = ("cfncluster-node provides the scripts for a cfncluster node."),
46-
url = ("https://github.com/awslabs/cfncluster"),
47-
license = "Apache License 2.0",
48-
packages = find_packages(),
49-
install_requires = requires,
41+
name="aws-parallelcluster-node",
42+
version=version,
43+
author="Amazon Web Services",
44+
description="aws-parallelcluster-node provides the scripts for an AWS ParallelCluster node.",
45+
url="https://github.com/aws/aws-parallelcluster-node",
46+
license="Apache License 2.0",
47+
packages=find_packages(),
48+
install_requires=requires,
5049
entry_points=dict(console_scripts=console_scripts),
51-
include_package_data = True,
52-
zip_safe = False,
53-
package_data = {
54-
'' : ['examples/config'],
50+
include_package_data=True,
51+
zip_safe=False,
52+
package_data={
53+
'': ['examples/config'],
5554
},
56-
long_description = ("cfncluster-node is the python package installed on the Amazon EC2 instances launched as part of CfnCluster."),
55+
long_description=("aws-parallelcluster-node is the python package installed on the Amazon EC2 instances launched "
56+
"as part of AWS ParallelCluster."),
5757
classifiers=[
5858
"Development Status :: 5 - Production/Stable",
5959
"Environment :: Console",

sqswatcher/plugins/sge.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ def addHost(hostname, cluster_user, slots):
8989
ssh._host_keys_filename = None
9090
pass
9191
ssh.save_host_keys(hosts_key_file)
92-
command = "sudo sh -c \'cd /opt/sge && /opt/sge/inst_sge -noremote -x -auto /opt/cfncluster/templates/sge/sge_inst.conf\'"
92+
command = "sudo sh -c \'cd /opt/sge && /opt/sge/inst_sge -noremote -x -auto /opt/parallelcluster/templates/sge/sge_inst.conf\'"
9393
stdin, stdout, stderr = ssh.exec_command(command)
9494
while not stdout.channel.exit_status_ready():
9595
time.sleep(1)

sqswatcher/sqswatcher.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ def pollQueue(scheduler, q, t, proxy_config):
134134
log.info("eventType=%s" % eventType)
135135
if eventType == 'autoscaling:TEST_NOTIFICATION':
136136
message.delete()
137-
elif eventType == 'cfncluster:COMPUTE_READY':
137+
elif eventType == 'parallelcluster:COMPUTE_READY':
138138
instanceId = message_attrs.get('EC2InstanceId')
139139
slots = message_attrs.get('Slots')
140140
log.info("instanceId=%s" % instanceId)

0 commit comments

Comments
 (0)