Merge lp:~kwmonroe/charms/trusty/hdp-hive/trunk into lp:charms/trusty/hdp-hive

[Kevin W Monroe]

Allow keyserver access via port 80. The mit.edu keyserver used in our gpg_ubuntu.sh script supports this, and it eases the install burden for people in restricted networks (default hkp xfers happen over port 11371, which would probably not be open/forwarded in most restrictive networks; port 80 is more likely to be free).

Also pull packages from the hortonworks http site since their https certs are broken. Security implications should be minimal since we do checksum verification on the payload prior to install. This also helps in restrictive networks where 443 may be blocked (and 80 open).

=== modified file 'files/scripts/gpg_ubuntu.sh'
--- files/scripts/gpg_ubuntu.sh	2014-08-11 22:30:08 +0000
+++ files/scripts/gpg_ubuntu.sh	2015-06-02 20:43:36 +0000
@@ -1,3 +1,3 @@
 #!/bin/sh
-gpg --keyserver pgp.mit.edu --recv-keys B9733A7A07513CAD
-gpg -a --export 07513CAD | apt-key add -
 \ No newline at end of file
+gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys B9733A7A07513CAD
+gpg -a --export 07513CAD | apt-key add -
 
=== modified file 'hooks/hdputils.py'
--- hooks/hdputils.py	2014-09-19 02:55:54 +0000
+++ hooks/hdputils.py	2015-06-02 20:43:36 +0000
@@ -61,7 +61,7 @@
     au = ArchiveUrlFetchHandler()
     if not os.path.exists(listpath):
       listsum = '3e53ca19f2c4461a6f4246a049a73779c4e81bce'
-      listurl = 'https://public-repo-1.hortonworks.com/HDP/ubuntu12/2.1.3.0/hdp.list'
+      listurl = 'http://public-repo-1.hortonworks.com/HDP/ubuntu12/2.1.3.0/hdp.list'
 
       tmpfile = au.download_and_validate(listurl, listsum)
       shutil.move(tmpfile, listpath)
@@ -74,7 +74,7 @@
 
     helperpath = os.path.join(home, 'hdp_manual_install_rpm_helper_files-2.1.1.385.tar.gz')
     if not os.path.exists(helperpath):
-      helperurl = 'https://public-repo-1.hortonworks.com/HDP/tools/2.1.1.0/hdp_manual_install_rpm_helper_files-2.1.1.385.tar.gz'
+      helperurl = 'http://public-repo-1.hortonworks.com/HDP/tools/2.1.1.0/hdp_manual_install_rpm_helper_files-2.1.1.385.tar.gz'
       helpersum = '5b59b7c71cf5bc95b19cf8d79dee170be5ceffd1'
       tmpfile = au.download_and_validate(helperurl, helpersum)
       shutil.move(tmpfile, helperpath)
@@ -177,4 +177,4 @@
 hdpScriptPath = os.path.join(os.path.sep,home, hdpScript,'scripts')
 usersAndGroupsScript = os.path.join(os.path.sep, hdpScriptPath, "usersAndGroups.sh")
 directoriesScript =  os.path.join(os.path.sep, hdpScriptPath, "directories.sh")
-bashrc = os.path.join(os.path.sep, home, '.bashrc')
 \ No newline at end of file
+bashrc = os.path.join(os.path.sep, home, '.bashrc')