From dc0cf8acbb28232d695636f8cdca5b30f858eb7d Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Sat, 29 Apr 2017 11:48:30 -0400 Subject: [PATCH] Fix puppet-apply tests Puppet is now throwing an error about this for centos-7 unit tests. Add empty SSH key for krotscheck. We also need to make sure puppet has been properly installed, this is because we have recently removed puppet from our diskimages. Change-Id: I8bcaddd045be3f81de5c2481e0de6a8526c97a91 Signed-off-by: Paul Belanger --- modules/openstack_project/manifests/users.pp | 1 + tools/prep-apply.sh | 2 ++ 2 files changed, 3 insertions(+) diff --git a/modules/openstack_project/manifests/users.pp b/modules/openstack_project/manifests/users.pp index 23100ea637..04307c7a85 100644 --- a/modules/openstack_project/manifests/users.pp +++ b/modules/openstack_project/manifests/users.pp @@ -185,6 +185,7 @@ class openstack_project::users { @user::virtual::localuser { 'krotscheck': realname => 'Michael Krotscheck', + sshkeys => '', uid => 2020, gid => 2020, } diff --git a/tools/prep-apply.sh b/tools/prep-apply.sh index 7449446a8d..cbeec3ea8e 100644 --- a/tools/prep-apply.sh +++ b/tools/prep-apply.sh @@ -43,6 +43,8 @@ declare -A INTEGRATION_MODULES source $MODULE_ENV_FILE +# Install puppet +sudo -E bash -x $ROOT/install_puppet.sh # Install SOURCE_MODULES sudo -E bash -x $ROOT/install_modules.sh