From 3f33bf09e3df3a66a01d6a7bb4d324a62975c700 Mon Sep 17 00:00:00 2001 From: Georgy Kibardin Date: Wed, 20 Jul 2016 16:10:18 +0300 Subject: [PATCH] Make a symlink to deployment scripts in /etc On master node there is no /etc/fuel/plugins/ directory. This causes failures of a plugin shell tasks on master node because before execution there is an attempt to set current directory to it. In order to fix this we make a symlink: /etc/fuel/plugins/ -> /var/www/nailgun/plugins//deployment_scripts Change-Id: Idbd2d94462b72a7f98967b379f504c245a6c7135 Closes-Bug: #1603987 --- 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 insertions(+) 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 58edd23..ed61427 100644 --- a/fuel_plugin_builder/templates/v2/build/plugin_rpm.spec.mako +++ b/fuel_plugin_builder/templates/v2/build/plugin_rpm.spec.mako @@ -32,9 +32,12 @@ 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 d55d847..ebe9257 100644 --- a/fuel_plugin_builder/templates/v3/build/plugin_rpm.spec.mako +++ b/fuel_plugin_builder/templates/v3/build/plugin_rpm.spec.mako @@ -33,6 +33,8 @@ 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} @@ -56,3 +58,4 @@ fi %%files /var/www/nailgun/plugins/${ name } +/etc/fuel/plugins/${ name } \ No newline at end of file