From: Krisztian Lengyel Date: Mon, 29 Apr 2019 12:43:59 +0000 (+0200) Subject: Extract RBAC manifest dir variable X-Git-Url: https://gerrit.akraino.org/r/gitweb?p=ta%2Fcaas-security.git;a=commitdiff_plain;h=355f77538cb9e2452749a8f45c3c305d25b20c5b Extract RBAC manifest dir variable Change-Id: I6da12fb4ea87205ac642f1198f889be3713bab07 Depends-On: I2969223948218155aff121c20731eb336c13fca6 Signed-off-by: Krisztian Lengyel --- diff --git a/.gitreview b/.gitreview new file mode 100644 index 0000000..cf5bdd6 --- /dev/null +++ b/.gitreview @@ -0,0 +1,5 @@ +[gerrit] +host=gerrit.akraino.org +port=29418 +project=ta/caas-security +defaultremote=origin diff --git a/rpmbuild.spec b/rpmbuild.spec index ff5b344..d6a7a70 100644 --- a/rpmbuild.spec +++ b/rpmbuild.spec @@ -16,7 +16,6 @@ %define RPM_NAME caas-%{COMPONENT} %define RPM_MAJOR_VERSION 1.0.0 %define RPM_MINOR_VERSION 1 -%define RBAC_MANIFEST_DIR /var/lib/caas/rbac_manifests/ Name: %{RPM_NAME} Version: %{RPM_MAJOR_VERSION} @@ -36,8 +35,8 @@ This rpm contains the necessary security related playbooks + manifests for the c %build %install -mkdir -p %{buildroot}/%{RBAC_MANIFEST_DIR}/ -rsync -av rbac_manifests/* %{buildroot}/%{RBAC_MANIFEST_DIR}/ +mkdir -p %{buildroot}/%{_caas_rbac_manifests_path}/ +rsync -av rbac_manifests/* %{buildroot}/%{_caas_rbac_manifests_path}/ mkdir -p %{buildroot}/%{_playbooks_path}/ rsync -av ansible/playbooks/* %{buildroot}/%{_playbooks_path}/ @@ -46,7 +45,7 @@ mkdir -p %{buildroot}/%{_roles_path}/ rsync -av ansible/roles/* %{buildroot}/%{_roles_path}/ %files -%{RBAC_MANIFEST_DIR}/* +%{_caas_rbac_manifests_path}/* %{_playbooks_path}/* %{_roles_path}/*