diff --git a/bootstrap_cfn/fab_tasks.py b/bootstrap_cfn/fab_tasks.py old mode 100644 new mode 100755 index ccedbea..5c96746 --- a/bootstrap_cfn/fab_tasks.py +++ b/bootstrap_cfn/fab_tasks.py @@ -212,7 +212,12 @@ def install_minions(): ec2.set_instance_tags(to_install, {'SaltMasterPrvIP': master_prv_ip}) for inst_ip in public_ips: env.host_string = 'ubuntu@%s' % inst_ip - sudo('wget https://raw.githubusercontent.com/ministryofjustice/bootstrap-cfn/master/scripts/bootstrap-salt.sh -O /tmp/moj-bootstrap.sh') + d = os.path.dirname(__file__) + mojscript = d + "/scripts/moj-bootstrap.sh" + if not os.path.isfile(mojscript): + print "ERROR: Cannot find %s" % mojscript + sys.exit(1) + put(mojscript, '/tmp', use_sudo=True) sudo('chmod 755 /tmp/moj-bootstrap.sh') sudo('/tmp/moj-bootstrap.sh') sudo( @@ -246,7 +251,12 @@ def install_master(): stack_public_ips.remove(master_public_ip) env.host_string = 'ubuntu@%s' % master_public_ip sha = '6080a18e6c7c2d49335978fa69fa63645b45bc2a' - sudo('wget https://raw.githubusercontent.com/ministryofjustice/bootstrap-cfn/master/scripts/bootstrap-salt.sh -O /tmp/moj-bootstrap.sh') + d = os.path.dirname(__file__) + mojscript = d + "/scripts/moj-bootstrap.sh" + if not os.path.isfile(mojscript): + print "ERROR: Cannot find %s" % mojscript + sys.exit(1) + put(mojscript, '/tmp') sudo('chmod 755 /tmp/moj-bootstrap.sh') sudo('/tmp/moj-bootstrap.sh') sudo( diff --git a/scripts/ec2_tags.py b/bootstrap_cfn/scripts/ec2_tags.py similarity index 100% rename from scripts/ec2_tags.py rename to bootstrap_cfn/scripts/ec2_tags.py diff --git a/scripts/bootstrap-salt.sh b/bootstrap_cfn/scripts/moj-bootstrap.sh old mode 100644 new mode 100755 similarity index 100% rename from scripts/bootstrap-salt.sh rename to bootstrap_cfn/scripts/moj-bootstrap.sh diff --git a/setup.py b/setup.py old mode 100644 new mode 100755 index 4640916..0ae9cfe --- a/setup.py +++ b/setup.py @@ -35,7 +35,7 @@ description='MOJDS cloudformation bootstrap tool', long_description=__doc__, packages=find_packages(), - package_data={'bootstrap_cfn': ['stacks/*']}, + package_data={'bootstrap_cfn': ['stacks/*', 'scripts/*']}, zip_safe=False, platforms='any', test_suite='tests',