summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-08-09 10:09:04 +0000
committerGerrit Code Review <review@openstack.org>2016-08-09 10:09:04 +0000
commitee875c63bb0ac2a4816b2bc4dd5260c93b9d4e12 (patch)
treee2f8cabe5357aa95e908fbba8fe488fb9ea8fed3
parent99e32daaa6f8c67d447f1f91333931548ff81b83 (diff)
parent3f33bf09e3df3a66a01d6a7bb4d324a62975c700 (diff)
Merge "Make a symlink to deployment scripts in /etc"
-rw-r--r--fuel_plugin_builder/templates/v2/build/plugin_rpm.spec.mako3
-rw-r--r--fuel_plugin_builder/templates/v3/build/plugin_rpm.spec.mako3
2 files changed, 6 insertions, 0 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 57434ce..294f4e0 100644
--- a/fuel_plugin_builder/templates/v2/build/plugin_rpm.spec.mako
+++ b/fuel_plugin_builder/templates/v2/build/plugin_rpm.spec.mako
@@ -36,9 +36,12 @@ tar -vxf %{SOURCE0} -C %{name}-%{version}
36cd %{name}-%{version} 36cd %{name}-%{version}
37mkdir -p %{buildroot}/var/www/nailgun/plugins/ 37mkdir -p %{buildroot}/var/www/nailgun/plugins/
38cp -r ${ name } %{buildroot}/var/www/nailgun/plugins/ 38cp -r ${ name } %{buildroot}/var/www/nailgun/plugins/
39mkdir -p %{buildroot}/etc/fuel/plugins
40ln -s ../../../var/www/nailgun/plugins/${ name }/deployment_scripts %{buildroot}/etc/fuel/plugins/${ name }
39 41
40%%clean 42%%clean
41rm -rf %{buildroot} 43rm -rf %{buildroot}
42 44
43%%files 45%%files
44/var/www/nailgun/plugins/${ name } 46/var/www/nailgun/plugins/${ name }
47/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 fc73075..a0e5bbd 100644
--- a/fuel_plugin_builder/templates/v3/build/plugin_rpm.spec.mako
+++ b/fuel_plugin_builder/templates/v3/build/plugin_rpm.spec.mako
@@ -37,6 +37,8 @@ tar -vxf %{SOURCE0} -C %{name}-%{version}
37cd %{name}-%{version} 37cd %{name}-%{version}
38mkdir -p %{buildroot}/var/www/nailgun/plugins/ 38mkdir -p %{buildroot}/var/www/nailgun/plugins/
39cp -r ${ name } %{buildroot}/var/www/nailgun/plugins/ 39cp -r ${ name } %{buildroot}/var/www/nailgun/plugins/
40mkdir -p %{buildroot}/etc/fuel/plugins
41ln -s ../../../var/www/nailgun/plugins/${ name }/deployment_scripts %{buildroot}/etc/fuel/plugins/${ name }
40 42
41%%clean 43%%clean
42rm -rf %{buildroot} 44rm -rf %{buildroot}
@@ -62,3 +64,4 @@ fi
62 64
63%%files 65%%files
64/var/www/nailgun/plugins/${ name } 66/var/www/nailgun/plugins/${ name }
67/etc/fuel/plugins/${ name } \ No newline at end of file