diff options
| author | Matt Wrock <matt@mattwrock.com> | 2016-10-05 22:48:33 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-05 22:48:33 -0700 |
| commit | fb000090fa9862f6649b02f4002b43219a553fc5 (patch) | |
| tree | 5e29a001dff04bae0db4cac43f65a37ae39b44ff | |
| parent | 9984b107e32cd5c4565c17e9ea8dd5bbe0da6bd7 (diff) | |
| parent | dbcd5960df7bec1a6d3de47c861e50af751b26ad (diff) | |
| download | chef-fb000090fa9862f6649b02f4002b43219a553fc5.tar.gz | |
Merge pull request #5407 from chef/chef_client
Fix centos 6 kitchen tests with chef-client cookbook 6.0.0
| -rw-r--r-- | kitchen-tests/.kitchen.travis.yml | 3 | ||||
| -rw-r--r-- | kitchen-tests/Berksfile.lock | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/kitchen-tests/.kitchen.travis.yml b/kitchen-tests/.kitchen.travis.yml index 9c5854d923..d73b41368d 100644 --- a/kitchen-tests/.kitchen.travis.yml +++ b/kitchen-tests/.kitchen.travis.yml @@ -62,6 +62,9 @@ platforms: - RUN yum clean all - RUN yum -y install which initscripts net-tools sudo wget - RUN sed -i -e "s/Defaults.*requiretty.*/Defaults !requiretty/g" /etc/sudoers + attributes: + chef_client: + init_style: init - name: centos-7 driver: diff --git a/kitchen-tests/Berksfile.lock b/kitchen-tests/Berksfile.lock index 0a60ca95f6..518aa56fac 100644 --- a/kitchen-tests/Berksfile.lock +++ b/kitchen-tests/Berksfile.lock @@ -33,7 +33,7 @@ GRAPH compat_resource (>= 12.14) mingw (>= 1.1) seven_zip (>= 0.0.0) - chef-client (5.0.0) + chef-client (6.0.0) cron (>= 1.7.0) logrotate (>= 1.9.0) windows (>= 1.42.0) |