bigdata-dev team mailing list archive

[Kevin W Monroe <kevin.monroe@xxxxxxxxxxxxx>]

Kevin W Monroe has proposed merging lp:~bigdata-dev/charms/trusty/apache-pig/trunk into lp:charms/trusty/apache-pig.

Requested reviews:
  Juju Big Data Development (bigdata-dev)

For more details, see:
https://code.launchpad.net/~bigdata-dev/charms/trusty/apache-pig/trunk/+merge/268661
-- 
Your team Juju Big Data Development is requested to review the proposed merge of lp:~bigdata-dev/charms/trusty/apache-pig/trunk into lp:charms/trusty/apache-pig.

=== modified file 'README.md'
--- README.md	2015-05-29 21:03:35 +0000
+++ README.md	2015-08-20 22:41:39 +0000
@@ -17,12 +17,12 @@
 This charm leverages our pluggable Hadoop model with the `hadoop-plugin`
 interface. This means that you will need to deploy a base Apache Hadoop cluster
 to run Pig. The suggested deployment method is to use the
-[apache-analytics-pig](https://jujucharms.com/u/bigdata-dev/apache-analytics-pig/)
+[apache-analytics-pig](https://jujucharms.com/apache-analytics-pig/)
 bundle. This will deploy the Apache Hadoop platform with a single Apache Pig
 unit that communicates with the cluster by relating to the
 `apache-hadoop-plugin` subordinate charm:
 
-    juju quickstart u/bigdata-dev/apache-analytics-pig
+    juju quickstart apache-analytics-pig
 
 Alternatively, you may manually deploy the recommended environment as follows:
 

=== modified file 'hooks/callbacks.py'
--- hooks/callbacks.py	2015-06-29 21:01:27 +0000
+++ hooks/callbacks.py	2015-08-20 22:41:39 +0000
@@ -58,10 +58,17 @@
         unitdata.kv().set('pig.installed', True)
 
     def setup_pig_config(self):
-        # copy default config into alternate dir
-        conf_dir = self.dist_config.path('pig') / 'conf'
-        self.dist_config.path('pig_conf').rmtree_p()
-        conf_dir.copytree(self.dist_config.path('pig_conf'))
+        '''
+        copy the default configuration files to pig_conf property
+        defined in dist.yaml
+        '''
+        default_conf = self.dist_config.path('pig') / 'conf'
+        pig_conf = self.dist_config.path('pig_conf')
+        pig_conf.rmtree_p()
+        default_conf.copytree(pig_conf)
+        # Now remove the conf included in the tarball and symlink our real conf
+        default_conf.rmtree_p()
+        pig_conf.symlink(default_conf)
 
     def configure_pig(self):
         pig_bin = self.dist_config.path('pig') / 'bin'

=== modified file 'resources.yaml'
--- resources.yaml	2015-07-24 16:14:24 +0000
+++ resources.yaml	2015-08-20 22:41:39 +0000
@@ -4,7 +4,7 @@
   pathlib:
     pypi: path.py>=7.0
   jujubigdata:
-    pypi: jujubigdata>=2.0.0,<3.0.0
+    pypi: jujubigdata>=4.0.0,<5.0.0
 optional_resources:
   pig-x86_64:
     url: https://git.launchpad.net/bigdata-data/plain/apache/x86_64/pig-0.14.0.tar.gz?id=c34a21c939f5fce9ab89b95d65fe2df50e7bbab0