From 89804e9b30fee4bd884107ce66178295011d8bb5 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Tue, 17 Oct 2017 11:22:48 -0700 Subject: [PATCH] Do not rely on openstack-puppet-modules We are removing openstack-puppet-modules package since we now have individual packages for each Puppet module. We can still rely on puppet-tripleo module to deploy all dependencies. Change-Id: I137cf3363dcc16f19895ecbf4b8afcb4858380e7 Related-Bug: #1676998 --- heat_docker_agent/configure_container.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/heat_docker_agent/configure_container.sh b/heat_docker_agent/configure_container.sh index 13ab94c82..fab63542c 100755 --- a/heat_docker_agent/configure_container.sh +++ b/heat_docker_agent/configure_container.sh @@ -33,7 +33,7 @@ else sed -i 's/\[delorean\]/\[delorean-current\]/' $REPO_PREFIX/delorean-current.repo /bin/bash -c "cat <<-EOF>>$REPO_PREFIX/delorean-current.repo -includepkgs=diskimage-builder,instack,instack-undercloud,os-apply-config,os-collect-config,os-net-config,os-refresh-config,python-tripleoclient,openstack-tripleo-common,openstack-tripleo-heat-templates,openstack-tripleo-image-elements,openstack-tripleo,openstack-tripleo-puppet-elements,openstack-puppet-modules,openstack-tripleo-ui,puppet-* +includepkgs=diskimage-builder,instack,instack-undercloud,os-apply-config,os-collect-config,os-net-config,os-refresh-config,python-tripleoclient,openstack-tripleo-common,openstack-tripleo-heat-templates,openstack-tripleo-image-elements,openstack-tripleo,openstack-tripleo-puppet-elements,openstack-tripleo-ui,puppet-* EOF" cat $REPO_PREFIX/delorean-current.repo @@ -47,7 +47,7 @@ yum install -y \ file \ initscripts \ jq \ - openstack-puppet-modules \ + puppet-tripleo \ openstack-tripleo-image-elements \ openstack-tripleo-puppet-elements \ openvswitch \