summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2013-01-31 11:17:49 -0800
committerelijah <elijah@riseup.net>2013-01-31 11:17:49 -0800
commit56f431cc4776cb49b3db1289ecd6c7deda71eb6f (patch)
treea9041d673e0535510052ebbbf065da174606af72 /lib
parent0d5a30572789e33422a1ef2b477ed825b9b85d44 (diff)
parent4c76fd7e1dc8b2a2489d2f99ffa6e305477177ad (diff)
Merge branch 'master' of ssh://leap.se/leap_cli
Conflicts: lib/leap_cli/commands/deploy.rb
Diffstat (limited to 'lib')
-rw-r--r--lib/leap_cli/commands/deploy.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/leap_cli/commands/deploy.rb b/lib/leap_cli/commands/deploy.rb
index 4d6e68a..07b338a 100644
--- a/lib/leap_cli/commands/deploy.rb
+++ b/lib/leap_cli/commands/deploy.rb
@@ -33,8 +33,8 @@ module LeapCli
# sync puppet manifests and apply them
ssh.set :puppet_source, [Path.platform, 'puppet'].join('/')
ssh.set :puppet_destination, '/srv/leap'
- tags = ['default']
- tags << 'slow' unless options[:fast]
+ tags = ['leap_base,leap_service']
+ tags << 'leap_slow' unless options[:fast]
ssh.set :puppet_command, "/usr/bin/puppet apply --color=false --tags=#{tags.join(',')}"
ssh.set :puppet_lib, "puppet/modules"
ssh.set :puppet_parameters, '--libdir puppet/lib --confdir puppet puppet/manifests/site.pp'