Update git submodules
* Update openstack-chef from branch 'master' - Install and use Chef Client instead of ChefDK on integration tests Using the chef-client baked into ChefDK is causing issues with the fog-openstack gem since it is locked in ChefDK. To work around this and better mimic how this is used in production, switch the integration tests to installing chef-client instead of ChefDK. - Split out pre-run playbooks between delivery and integration (keep ChefDK for delivery) - Install Chef 14 by default - Install Berkshelf in Chef - Install cookstyle which is needed in the Rakefile - Update command paths so that berkshelf is available with Chef and ChefDK - Update ChefDK to 3.2.30 but not higher due to issues with chefspec and apache2 [1] - Upgrade fog-openstack gem to work around extraneous warnings to match cookbook-openstackclient - Remove unneeded pip downgrade [1] https://github.com/sous-chefs/apache2/issues/588 Change-Id: I0b0c2eb80dc0d831685cc7f69a1186a6148e6258 Signed-off-by: Lance Albertson <lance@osuosl.org>
This commit is contained in:
parent
ae7898bbb0
commit
6b2ba93047
@ -1 +1 @@
|
||||
Subproject commit 9df3917f9be4b5878190827906b5fe7546b17d48
|
||||
Subproject commit 9a1672a07273ac4f42d906adb01ee1a2688e675f
|
Loading…
Reference in New Issue
Block a user