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

Merge pull request #1377 from nacx/chef-version 

There is no need to force the Chef version anymore
This commit is contained in:
Adrian Cole 2013-03-01 15:19:52 -08:00
parent d4658cc72c 0e1e552b9d
commit b26dfb9b94
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() {
// Chef versions prior to 10.16.4 install an incompatible moneta gem.
// 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

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 {
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() {

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

@ -47,7 +47,7 @@ public class InstallChefGemsTest {
assertEquals(
new InstallChefGems().render(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 {

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 --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