From 0f12203ac86868377b07d77bf49bd709dd9e88ae Mon Sep 17 00:00:00 2001 From: K Jonathan Harker Date: Fri, 13 Mar 2015 12:15:57 -0700 Subject: [PATCH] Remove unneeded workaround Now that the pull request has merged, this workaround is no longer needed. Change-Id: I6fce6eb13d3e7c8da9ed60a7b9226c6ddb740b2a --- nodepool/scripts/prepare_node.sh | 7 ------- 1 file changed, 7 deletions(-) diff --git a/nodepool/scripts/prepare_node.sh b/nodepool/scripts/prepare_node.sh index 196db9bc53..9b19331855 100755 --- a/nodepool/scripts/prepare_node.sh +++ b/nodepool/scripts/prepare_node.sh @@ -52,13 +52,6 @@ fi wget https://git.openstack.org/cgit/openstack-infra/system-config/plain/install_puppet.sh sudo bash -xe install_puppet.sh -if [ "$THIN" = "false" ] ; then - # Workaround necessary until this pull request: - # https://github.com/puppetlabs/puppetlabs_spec_helper/pull/90 - # is merged. - sudo gem install --version '~>2.99.0' rspec -fi - sudo git clone --depth=1 $GIT_BASE/openstack-infra/system-config.git \ /root/system-config sudo /bin/bash /root/system-config/install_modules.sh