rename scripts/bootstrap.sh to scripts/moj-bootstrap.sh

added the scripts directory to package_data in setup.py

modified fab_tasks.py to use new moj-bootstrap.sh script and to use put instead of wget

moved the scripts dir under bootstrap_cfn + changed the moj-bootstrap.sh and setup.py accordingly

renamed moj-bootstrap.sh, added script to package_data, moved scripts directory, using put instead of wget

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(

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',