Code Review
/
ta
/
caas-logging.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Hybrid logging
[ta/caas-logging.git]
/
SPECS
/
fluentd.spec
diff --git
a/SPECS/fluentd.spec
b/SPECS/fluentd.spec
index
6af5a31
..
3e1d394
100644
(file)
--- a/
SPECS/fluentd.spec
+++ b/
SPECS/fluentd.spec
@@
-15,7
+15,7
@@
%define COMPONENT fluentd
%define RPM_NAME caas-%{COMPONENT}
%define RPM_MAJOR_VERSION 1.5.2
%define COMPONENT fluentd
%define RPM_NAME caas-%{COMPONENT}
%define RPM_MAJOR_VERSION 1.5.2
-%define RPM_MINOR_VERSION
1
+%define RPM_MINOR_VERSION
2
%define IMAGE_TAG %{RPM_MAJOR_VERSION}-%{RPM_MINOR_VERSION}
Name: %{RPM_NAME}
%define IMAGE_TAG %{RPM_MAJOR_VERSION}-%{RPM_MINOR_VERSION}
Name: %{RPM_NAME}
@@
-62,27
+62,10
@@
docker rmi -f %{COMPONENT}:%{IMAGE_TAG}
mkdir -p %{buildroot}/%{_caas_container_tar_path}/
rsync -av %{_builddir}/%{RPM_NAME}-%{RPM_MAJOR_VERSION}/docker-save/%{COMPONENT}:%{IMAGE_TAG}.tar %{buildroot}/%{_caas_container_tar_path}/
mkdir -p %{buildroot}/%{_caas_container_tar_path}/
rsync -av %{_builddir}/%{RPM_NAME}-%{RPM_MAJOR_VERSION}/docker-save/%{COMPONENT}:%{IMAGE_TAG}.tar %{buildroot}/%{_caas_container_tar_path}/
-mkdir -p %{buildroot}/%{_playbooks_path}/
-rsync -av ansible/playbooks/fluentd.yaml %{buildroot}/%{_playbooks_path}/
-
-mkdir -p %{buildroot}/%{_roles_path}/
-rsync -av ansible/roles/fluentd %{buildroot}/%{_roles_path}/
-
%files
%{_caas_container_tar_path}/%{COMPONENT}:%{IMAGE_TAG}.tar
%files
%{_caas_container_tar_path}/%{COMPONENT}:%{IMAGE_TAG}.tar
-%{_playbooks_path}/fluentd.yaml
-%{_roles_path}/fluentd
%preun
%preun
-
%post
%post
-mkdir -p %{_postconfig_path}/
-ln -sf %{_playbooks_path}/fluentd.yaml %{_postconfig_path}/
-
-%postun
-if [ $1 -eq 0 ]; then
- rm -f %{_postconfig_path}/fluentd.yaml
-fi
-
%clean
rm -rf ${buildroot}
%clean
rm -rf ${buildroot}