use basic layer package options instead of relying on the install hook.

juju-solutions · c66183ce52e9cefe188af32facf5929406aacce5 · kwmonroe committed Jan 12, 2016 · Jan 12, 2016 · c66183c
1 parent e662e95
commit c66183ce52e9cefe188af32facf5929406aacce5
Unified Split

Showing with 7 additions and 3 deletions.

+7 −0 layer.yaml

+0 −3 reactive/ubuntu-devenv.py
diff --git a/layer.yaml b/layer.yaml
@@ -1 +1,8 @@
 includes: ['layer:basic', 'interface:java']
+options:
+  basic:
+    packages:
+      - bzr
+      - cvs
+      - git
+      - subversion
diff --git a/reactive/ubuntu-devenv.py b/reactive/ubuntu-devenv.py
@@ -10,7 +10,4 @@
 
 @hook('install')
 def install():
-    ''' Install VCS tooling '''
-    status_set('maintenance', 'Installing VCS tools')
-    check_call(['apt-get', 'install', '-y', 'bzr', 'cvs', 'git', 'subversion'])
     status_set('active', 'Ubuntu Dev Env ready!')