Updated Branches: refs/heads/master c94ed110a -> 418a7c149
JCLOUDS-41: More fixes caused by a change in jclouds-chef See https://git-wip-us.apache.org/repos/asf?p=incubator-jclouds-chef.git;a=commit;h=7f029db1c7b618494b47adb39d04aebebec726c3 and JCLOUDS-3 Project: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/commit/746f0e01 Tree: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/tree/746f0e01 Diff: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/diff/746f0e01 Branch: refs/heads/master Commit: 746f0e01dcedbe6c2b79ad89d1d1981e185aaa12 Parents: c94ed11 Author: Andrew Phillips <[email protected]> Authored: Wed May 15 13:15:51 2013 -0400 Committer: Andrew Phillips <[email protected]> Committed: Wed May 15 14:34:21 2013 -0400 ---------------------------------------------------------------------- .../karaf/chef/commands/ChefGroupBootStrap.java | 4 +++- .../karaf/chef/commands/ChefNodeBootstrap.java | 4 +++- .../karaf/chef/services/ChefRecipeProvider.java | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/blob/746f0e01/chef/commands/src/main/java/org/jclouds/karaf/chef/commands/ChefGroupBootStrap.java ---------------------------------------------------------------------- diff --git a/chef/commands/src/main/java/org/jclouds/karaf/chef/commands/ChefGroupBootStrap.java b/chef/commands/src/main/java/org/jclouds/karaf/chef/commands/ChefGroupBootStrap.java index 0d3847b..4809b28 100644 --- a/chef/commands/src/main/java/org/jclouds/karaf/chef/commands/ChefGroupBootStrap.java +++ b/chef/commands/src/main/java/org/jclouds/karaf/chef/commands/ChefGroupBootStrap.java @@ -23,6 +23,7 @@ import org.apache.felix.gogo.commands.Argument; import org.apache.felix.gogo.commands.Command; import org.apache.felix.gogo.commands.Option; import org.jclouds.chef.ChefService; +import org.jclouds.chef.domain.BootstrapConfig; import org.jclouds.chef.util.RunListBuilder; import org.jclouds.scriptbuilder.domain.Statement; @@ -61,7 +62,8 @@ public class ChefGroupBootStrap extends ChefRunscriptBase { ChefService chefService = getChefService(); if (chefService != null) { List<String> runlist = new RunListBuilder().addRecipes(cookbook).build(); - chefService.updateRunListForGroup(runlist, group); + BootstrapConfig bootstrapConfig = BootstrapConfig.builder().runList(runlist).build(); + chefService.updateBootstrapConfigForGroup(group, bootstrapConfig); statement = chefService.createBootstrapScriptForGroup(group); } return statement; http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/blob/746f0e01/chef/commands/src/main/java/org/jclouds/karaf/chef/commands/ChefNodeBootstrap.java ---------------------------------------------------------------------- diff --git a/chef/commands/src/main/java/org/jclouds/karaf/chef/commands/ChefNodeBootstrap.java b/chef/commands/src/main/java/org/jclouds/karaf/chef/commands/ChefNodeBootstrap.java index 360b5c4..22a7ef7 100644 --- a/chef/commands/src/main/java/org/jclouds/karaf/chef/commands/ChefNodeBootstrap.java +++ b/chef/commands/src/main/java/org/jclouds/karaf/chef/commands/ChefNodeBootstrap.java @@ -23,6 +23,7 @@ import org.apache.felix.gogo.commands.Argument; import org.apache.felix.gogo.commands.Command; import org.apache.felix.gogo.commands.Option; import org.jclouds.chef.ChefService; +import org.jclouds.chef.domain.BootstrapConfig; import org.jclouds.chef.util.RunListBuilder; import org.jclouds.scriptbuilder.domain.Statement; @@ -61,7 +62,8 @@ public class ChefNodeBootstrap extends ChefRunscriptBase { ChefService chefService = getChefService(); if (chefService != null) { List<String> runlist = new RunListBuilder().addRecipes(cookbook).build(); - chefService.updateRunListForGroup(runlist, "single"); + BootstrapConfig bootstrapConfig = BootstrapConfig.builder().runList(runlist).build(); + chefService.updateBootstrapConfigForGroup("single", bootstrapConfig); statement = chefService.createBootstrapScriptForGroup("single"); } return statement; http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/blob/746f0e01/chef/services/src/main/java/org/jclouds/karaf/chef/services/ChefRecipeProvider.java ---------------------------------------------------------------------- diff --git a/chef/services/src/main/java/org/jclouds/karaf/chef/services/ChefRecipeProvider.java b/chef/services/src/main/java/org/jclouds/karaf/chef/services/ChefRecipeProvider.java index e19fcb7..e6f820b 100644 --- a/chef/services/src/main/java/org/jclouds/karaf/chef/services/ChefRecipeProvider.java +++ b/chef/services/src/main/java/org/jclouds/karaf/chef/services/ChefRecipeProvider.java @@ -21,6 +21,7 @@ package org.jclouds.karaf.chef.services; import com.google.common.collect.Sets; import org.jclouds.chef.ChefService; +import org.jclouds.chef.domain.BootstrapConfig; import org.jclouds.chef.domain.CookbookVersion; import org.jclouds.chef.util.RunListBuilder; import org.jclouds.karaf.recipe.RecipeProvider; @@ -47,7 +48,8 @@ public class ChefRecipeProvider implements RecipeProvider { @Override public Statement createStatement(String recipe, String group) { List<String> runlist = new RunListBuilder().addRecipes(recipe).build(); - chefService.updateRunListForGroup(runlist, group); + BootstrapConfig bootstrapConfig = BootstrapConfig.builder().runList(runlist).build(); + chefService.updateBootstrapConfigForGroup(group, bootstrapConfig); return chefService.createBootstrapScriptForGroup(group); }
