Skip to content

Commit

Permalink
SM-Third-Party: Fix rpm puppet build
Browse files Browse the repository at this point in the history
Partial-Bug: #1633034

use correct directary for builddir

Change-Id: I86b436f2183e3e340951f272bff0533dd338d516
  • Loading branch information
Dheeraj Gautam committed Oct 13, 2016
1 parent 57111cc commit 6efd1af
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions common/rpm/contrail-install-packages.spec
Expand Up @@ -55,10 +55,10 @@ pushd %{_builddir}/..
install -p -m 755 tools/packaging/build/setup.sh %{buildroot}%{_contrailopt}/contrail_packages/setup.sh.new

# %{_builddir}%/../build/puppet is a temp dir for puppet-third-party and puppet
install -d -m 755 %{_builddir}%/../build/puppet
cp -rp %{_builddir}%/../tools/puppet %{_builddir}%/../build/
install -d -m 755 %{_builddir}/../build/puppet
cp -rp %{_builddir}/../tools/puppet %{_builddir}/../build/
# Install puppet manifests
if [ -d %{_builddir}%/../tools/puppet-third-party ]; then echo "New Modules"; cp -rp %{_builddir}%/../tools/puppet-third-party/* %{_builddir}%/../build/puppet/contrail/environment/modules/ ; fi
if [ -d %{_builddir}/../tools/puppet-third-party ]; then echo "CIP New Modules"; cp -rp %{_builddir}/../tools/puppet-third-party/* %{_builddir}/../build/puppet/contrail/environment/modules/ ; fi


# Install puppet manifests
Expand Down

0 comments on commit 6efd1af

Please sign in to comment.