From 13c73e560959f2de7acc7227a616fb90edd54d05 Mon Sep 17 00:00:00 2001 From: Evgeny L Date: Fri, 9 Dec 2016 20:19:41 +0000 Subject: [PATCH] Revert "Make a symlink to deployment scripts in /etc" The fix broke backward compatibility and used hardcoded value. Related-bug: #1603987 Related-bug: #1648882 This reverts commit 3f33bf09e3df3a66a01d6a7bb4d324a62975c700. Change-Id: Ie3420116926bef518d68c3e3b381e5cff4c98b6f --- fuel_plugin_builder/templates/v2/build/plugin_rpm.spec.mako | 3 --- fuel_plugin_builder/templates/v3/build/plugin_rpm.spec.mako | 3 --- 2 files changed, 6 deletions(-) diff --git a/fuel_plugin_builder/templates/v2/build/plugin_rpm.spec.mako b/fuel_plugin_builder/templates/v2/build/plugin_rpm.spec.mako index 294f4e0..57434ce 100644 --- a/fuel_plugin_builder/templates/v2/build/plugin_rpm.spec.mako +++ b/fuel_plugin_builder/templates/v2/build/plugin_rpm.spec.mako @@ -36,12 +36,9 @@ tar -vxf %{SOURCE0} -C %{name}-%{version} cd %{name}-%{version} mkdir -p %{buildroot}/var/www/nailgun/plugins/ cp -r ${ name } %{buildroot}/var/www/nailgun/plugins/ -mkdir -p %{buildroot}/etc/fuel/plugins -ln -s ../../../var/www/nailgun/plugins/${ name }/deployment_scripts %{buildroot}/etc/fuel/plugins/${ name } %%clean rm -rf %{buildroot} %%files /var/www/nailgun/plugins/${ name } -/etc/fuel/plugins/${ name } diff --git a/fuel_plugin_builder/templates/v3/build/plugin_rpm.spec.mako b/fuel_plugin_builder/templates/v3/build/plugin_rpm.spec.mako index 2514d37..6ac24e5 100644 --- a/fuel_plugin_builder/templates/v3/build/plugin_rpm.spec.mako +++ b/fuel_plugin_builder/templates/v3/build/plugin_rpm.spec.mako @@ -37,8 +37,6 @@ tar -vxf %{SOURCE0} -C %{name}-%{version} cd %{name}-%{version} mkdir -p %{buildroot}/var/www/nailgun/plugins/ cp -r ${ name } %{buildroot}/var/www/nailgun/plugins/ -mkdir -p %{buildroot}/etc/fuel/plugins -ln -s ../../../var/www/nailgun/plugins/${ name }/deployment_scripts %{buildroot}/etc/fuel/plugins/${ name } %%clean rm -rf %{buildroot} @@ -64,4 +62,3 @@ fi %%files /var/www/nailgun/plugins/${ name } -/etc/fuel/plugins/${ name } \ No newline at end of file