From 8b7176fa8c40c8cee9d1bfbd9aa75e230bc5cd60 Mon Sep 17 00:00:00 2001 From: varac Date: Thu, 31 Jan 2013 11:37:37 +0100 Subject: tag 'default' interferes with puppet automatic tagging --- lib/leap_cli/commands/deploy.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/leap_cli') diff --git a/lib/leap_cli/commands/deploy.rb b/lib/leap_cli/commands/deploy.rb index 818e08e..ab2042d 100644 --- a/lib/leap_cli/commands/deploy.rb +++ b/lib/leap_cli/commands/deploy.rb @@ -33,7 +33,7 @@ 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 = ['base'] tags << 'slow' unless options[:fast] ssh.set :puppet_command, "/usr/bin/puppet apply --color=false --tags=#{tags.join(', ')}" ssh.set :puppet_lib, "puppet/modules" -- cgit v1.2.3 From 8e20cc0da9690293f49aa0bee6475a692e0482ed Mon Sep 17 00:00:00 2001 From: varac Date: Thu, 31 Jan 2013 19:10:59 +0100 Subject: tag 'base' is a bad idea because it invokes apache::base as well --- lib/leap_cli/commands/deploy.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/leap_cli') diff --git a/lib/leap_cli/commands/deploy.rb b/lib/leap_cli/commands/deploy.rb index ab2042d..ebd8909 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 = ['base'] - tags << 'slow' unless options[:fast] + tags = ['leap_base'] + 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' -- cgit v1.2.3 From 1c58ef79e3f2933a03fdb7397153a0493e19ba17 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Thu, 31 Jan 2013 13:13:59 -0500 Subject: fix erroneous space between tags (#1571) --- lib/leap_cli/commands/deploy.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/leap_cli') diff --git a/lib/leap_cli/commands/deploy.rb b/lib/leap_cli/commands/deploy.rb index ebd8909..e7dffef 100644 --- a/lib/leap_cli/commands/deploy.rb +++ b/lib/leap_cli/commands/deploy.rb @@ -35,7 +35,7 @@ module LeapCli ssh.set :puppet_destination, '/srv/leap' tags = ['leap_base'] tags << 'leap_slow' unless options[:fast] - ssh.set :puppet_command, "/usr/bin/puppet apply --color=false --tags=#{tags.join(', ')}" + 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' ssh.set :puppet_stream_output, true -- cgit v1.2.3 From 4c76fd7e1dc8b2a2489d2f99ffa6e305477177ad Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Thu, 31 Jan 2013 13:23:30 -0500 Subject: include tag leap_service by default (#1610) --- lib/leap_cli/commands/deploy.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/leap_cli') diff --git a/lib/leap_cli/commands/deploy.rb b/lib/leap_cli/commands/deploy.rb index e7dffef..07b338a 100644 --- a/lib/leap_cli/commands/deploy.rb +++ b/lib/leap_cli/commands/deploy.rb @@ -33,7 +33,7 @@ module LeapCli # sync puppet manifests and apply them ssh.set :puppet_source, [Path.platform, 'puppet'].join('/') ssh.set :puppet_destination, '/srv/leap' - tags = ['leap_base'] + 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" -- cgit v1.2.3