Juju Charms Collection
apache-pig package

Merge lp:~bigdata-dev/charms/trusty/apache-pig/trunk into lp:charms/trusty/apache-pig

  1. Trusty Tahr (14.04)
  2. trunk
  3. Merge into trunk
Proposed by Kevin W Monroe
Status: Merged
Merged at revision: 30
Proposed branch: lp:~bigdata-dev/charms/trusty/apache-pig/trunk
Merge into: lp:charms/trusty/apache-pig
Diff against target: 59 lines (+14/-7)
3 files modified
README.md (+2/-2)
hooks/callbacks.py (+11/-4)
resources.yaml (+1/-1)
To merge this branch: bzr merge lp:~bigdata-dev/charms/trusty/apache-pig/trunk
Reviewer Review Type Date Requested Status
Kevin W Monroe Approve
Review via email: mp+268661@code.launchpad.net
To post a comment you must log in.
lp:~bigdata-dev/charms/trusty/apache-pig/trunk updated
39. By Cory Johns

Fixed permissions on test_dist_config.py

Revision history for this message
Kevin W Monroe (kwmonroe) wrote :

Realtime syslog analytics bundle test looked good. Merged.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'README.md'
2--- README.md 2015-05-29 21:03:35 +0000
3+++ README.md 2015-08-21 21:51:59 +0000
4@@ -17,12 +17,12 @@
5 This charm leverages our pluggable Hadoop model with the `hadoop-plugin`
6 interface. This means that you will need to deploy a base Apache Hadoop cluster
7 to run Pig. The suggested deployment method is to use the
8-[apache-analytics-pig](https://jujucharms.com/u/bigdata-dev/apache-analytics-pig/)
9+[apache-analytics-pig](https://jujucharms.com/apache-analytics-pig/)
10 bundle. This will deploy the Apache Hadoop platform with a single Apache Pig
11 unit that communicates with the cluster by relating to the
12 `apache-hadoop-plugin` subordinate charm:
13
14- juju quickstart u/bigdata-dev/apache-analytics-pig
15+ juju quickstart apache-analytics-pig
16
17 Alternatively, you may manually deploy the recommended environment as follows:
18
19
20=== modified file 'hooks/callbacks.py'
21--- hooks/callbacks.py 2015-06-29 21:01:27 +0000
22+++ hooks/callbacks.py 2015-08-21 21:51:59 +0000
23@@ -58,10 +58,17 @@
24 unitdata.kv().set('pig.installed', True)
25
26 def setup_pig_config(self):
27- # copy default config into alternate dir
28- conf_dir = self.dist_config.path('pig') / 'conf'
29- self.dist_config.path('pig_conf').rmtree_p()
30- conf_dir.copytree(self.dist_config.path('pig_conf'))
31+ '''
32+ copy the default configuration files to pig_conf property
33+ defined in dist.yaml
34+ '''
35+ default_conf = self.dist_config.path('pig') / 'conf'
36+ pig_conf = self.dist_config.path('pig_conf')
37+ pig_conf.rmtree_p()
38+ default_conf.copytree(pig_conf)
39+ # Now remove the conf included in the tarball and symlink our real conf
40+ default_conf.rmtree_p()
41+ pig_conf.symlink(default_conf)
42
43 def configure_pig(self):
44 pig_bin = self.dist_config.path('pig') / 'bin'
45
46=== modified file 'resources.yaml'
47--- resources.yaml 2015-07-24 16:14:24 +0000
48+++ resources.yaml 2015-08-21 21:51:59 +0000
49@@ -4,7 +4,7 @@
50 pathlib:
51 pypi: path.py>=7.0
52 jujubigdata:
53- pypi: jujubigdata>=2.0.0,<3.0.0
54+ pypi: jujubigdata>=4.0.0,<5.0.0
55 optional_resources:
56 pig-x86_64:
57 url: https://git.launchpad.net/bigdata-data/plain/apache/x86_64/pig-0.14.0.tar.gz?id=c34a21c939f5fce9ab89b95d65fe2df50e7bbab0
58
59=== modified file 'tests/remote/test_dist_config.py' (properties changed: -x to +x)

Subscribers

People subscribed via source and target branches