Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

There is no need to force the Chef version anymore

This commit is contained in:
Ignasi Barrera 2013-02-28 21:03:55 +01:00
parent 9dbaff2420
commit 0e1e552b9d
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/chef/InstallChefGems.java
View File

@ -34,7 +34,7 @@ public class InstallChefGems extends StatementList {
public InstallChefGems() { public InstallChefGems() {
// Chef versions prior to 10.16.4 install an incompatible moneta gem. // Chef versions prior to 10.16.4 install an incompatible moneta gem.
// See: http://tickets.opscode.com/browse/CHEF-3721 // See: http://tickets.opscode.com/browse/CHEF-3721
super(new InstallRuby(), exec("gem install chef -v '>= 10.16.4' --no-rdoc --no-ri")); super(new InstallRuby(), exec("gem install chef --no-rdoc --no-ri"));
} }
@Override @Override

2
scriptbuilder/src/test/java/org/jclouds/scriptbuilder/statements/chef/ChefSoloTest.java
View File

@ -382,7 +382,7 @@ public class ChefSoloTest {
private static String installChefGems() throws IOException { private static String installChefGems() throws IOException {
return Resources.toString(Resources.getResource("test_install_ruby." + ShellToken.SH.to(OsFamily.UNIX)), return Resources.toString(Resources.getResource("test_install_ruby." + ShellToken.SH.to(OsFamily.UNIX)),
Charsets.UTF_8) + "gem install chef -v '>= 10.16.4' --no-rdoc --no-ri\n"; Charsets.UTF_8) + "gem install chef --no-rdoc --no-ri\n";
} }
private static String createConfigFile() { private static String createConfigFile() {

2
scriptbuilder/src/test/java/org/jclouds/scriptbuilder/statements/chef/InstallChefGemsTest.java
View File

@ -47,7 +47,7 @@ public class InstallChefGemsTest {
assertEquals( assertEquals(
new InstallChefGems().render(OsFamily.UNIX), new InstallChefGems().render(OsFamily.UNIX),
Resources.toString(Resources.getResource("test_install_ruby." + ShellToken.SH.to(OsFamily.UNIX)), Resources.toString(Resources.getResource("test_install_ruby." + ShellToken.SH.to(OsFamily.UNIX)),
Charsets.UTF_8) + "gem install chef -v '>= 10.16.4' --no-rdoc --no-ri\n"); Charsets.UTF_8) + "gem install chef --no-rdoc --no-ri\n");
} }
public void installChefGemsUnixInScriptBuilderSourcesSetupPublicCurl() throws IOException { public void installChefGemsUnixInScriptBuilderSourcesSetupPublicCurl() throws IOException {

2
scriptbuilder/src/test/resources/test_install_chef_gems_scriptbuilder.sh
View File

@ -184,7 +184,7 @@ END_OF_JCLOUDS_SCRIPT
gem update --system gem update --system
gem update --no-rdoc --no-ri gem update --no-rdoc --no-ri
gem install chef -v '>= 10.16.4' --no-rdoc --no-ri gem install chef --no-rdoc --no-ri
END_OF_JCLOUDS_SCRIPT END_OF_JCLOUDS_SCRIPT