starlingx/config
Code Issues Proposed changes

Standardize makefiles for puppet-modules-wrs

Browse Source 
The puppet-modules-wrs is formed by several subcomponents, in all
of them the same changes were applied:

  - Create a makefile with a install target.
  - Remove license file from build_srpm.data as is not needed.
  - Update target in specfile
  - Change autosetup to setup in specfile, this was bug in the spec
    files.

Testing:
  - Verification on correct install paths.
  - config_controller complete on simplex configuration.

Change-Id: I1512eb0c3034ffa2d57d098dab9800bdaba5b48d
Story: 2004043
Task: 27552
Signed-off-by: Erich Cordoba <erich.cordoba.malibran@intel.com>
This commit is contained in:
Erich Cordoba 2019-02-05 18:29:10 -06:00
parent 992fe3a26b
commit ea0b33e950
27 changed files with 130 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
puppet-modules-wrs/puppet-dcmanager/centos/build_srpm.data
View File

@ -1,3 +1,2 @@
SRC_DIR="src"
COPY_LIST="$SRC_DIR/LICENSE"
TIS_PATCH_VER=1

10
puppet-modules-wrs/puppet-dcmanager/centos/puppet-dcmanager.spec
View File

@ -10,7 +10,6 @@ Packager: Wind River <info@windriver.com>
URL: unknown
Source0: %{name}-%{version}.tar.gz
Source1: LICENSE
BuildArch: noarch
@ -20,16 +19,15 @@ BuildRequires: python2-devel
A puppet module for dcmanager
%prep
%autosetup -c %{module_dir}
%setup
#
# The src for this puppet module needs to be staged to puppet/modules
#
%install
install -d -m 0755 %{buildroot}%{_datadir}/puppet/modules/%{module_dir}
cp -R %{name}-%{version}/%{module_dir} %{buildroot}%{_datadir}/puppet/modules
make install \
MODULEDIR=%{buildroot}%{_datadir}/puppet/modules
%files
%license %{name}-%{version}/LICENSE
%license LICENSE
%{_datadir}/puppet/modules/%{module_dir}

9
puppet-modules-wrs/puppet-dcmanager/src/Makefile Normal file
View File

@ -0,0 +1,9 @@
#
# SPDX-License-Identifier: Apache-2.0
#
MODULEDIR ?= /usr/share/puppet/modules
install:
install -d -m 0755 $(MODULEDIR)/dcmanager
cp -R dcmanager/ $(MODULEDIR)/

1
puppet-modules-wrs/puppet-dcorch/centos/build_srpm.data
View File

@ -1,3 +1,2 @@
SRC_DIR="src"
COPY_LIST="$SRC_DIR/LICENSE"
TIS_PATCH_VER=1

9
puppet-modules-wrs/puppet-dcorch/centos/puppet-dcorch.spec
View File

@ -10,7 +10,6 @@ Packager: Wind River <info@windriver.com>
URL: unknown
Source0: %{name}-%{version}.tar.gz
Source1: LICENSE
BuildArch: noarch
@ -20,16 +19,16 @@ BuildRequires: python2-devel
A puppet module for dcorch
%prep
%autosetup -c %{module_dir}
%setup
#
# The src for this puppet module needs to be staged to puppet/modules
#
%install
install -d -m 0755 %{buildroot}%{_datadir}/puppet/modules/%{module_dir}
cp -R %{name}-%{version}/%{module_dir} %{buildroot}%{_datadir}/puppet/modules
make install \
MODULEDIR=%{buildroot}%{_datadir}/puppet/modules
%files
%license %{name}-%{version}/LICENSE
%license LICENSE
%{_datadir}/puppet/modules/%{module_dir}

9
puppet-modules-wrs/puppet-dcorch/src/Makefile Normal file
View File

@ -0,0 +1,9 @@
#
# SPDX-License-Identifier: Apache-2.0
#
MODULEDIR ?= /usr/share/puppet/modules
install:
install -d -m 0755 $(MODULEDIR)/dcorch
cp -R dcorch/ $(MODULEDIR)/

1
puppet-modules-wrs/puppet-fm/centos/build_srpm.data
View File

@ -1,3 +1,2 @@
SRC_DIR="src"
COPY_LIST="$SRC_DIR/LICENSE"
TIS_PATCH_VER=1

9
puppet-modules-wrs/puppet-fm/centos/puppet-fm.spec
View File

@ -10,7 +10,6 @@ Packager: Wind River <info@windriver.com>
URL: unknown
Source0: %{name}-%{version}.tar.gz
Source1: LICENSE
BuildArch: noarch
@ -20,15 +19,15 @@ BuildRequires: python2-devel
A puppet module for Fault Management
%prep
%autosetup -c %{module_dir}
%setup
#
# The src for this puppet module needs to be staged to puppet/modules
#
%install
install -d -m 0755 %{buildroot}%{_datadir}/puppet/modules/%{module_dir}
cp -R %{name}-%{version}/%{module_dir} %{buildroot}%{_datadir}/puppet/modules
make install \
MODULEDIR=%{buildroot}%{_datadir}/puppet/modules
%files
%license %{name}-%{version}/LICENSE
%license LICENSE
%{_datadir}/puppet/modules/%{module_dir}

9
puppet-modules-wrs/puppet-fm/src/Makefile Normal file
View File

@ -0,0 +1,9 @@
#
# SPDX-License-Identifier: Apache-2.0
#
MODULEDIR ?= /usr/share/puppet/modules
install:
install -d -m 0755 $(MODULEDIR)/fm
cp -R fm/ $(MODULEDIR)/

1
puppet-modules-wrs/puppet-mtce/centos/build_srpm.data
View File

@ -1,3 +1,2 @@
SRC_DIR="src"
COPY_LIST="$SRC_DIR/LICENSE"
TIS_PATCH_VER=9

10
puppet-modules-wrs/puppet-mtce/centos/puppet-mtce.spec
View File

@ -10,7 +10,6 @@ Packager: Wind River <info@windriver.com>
URL: unknown
Source0: %{name}-%{version}.tar.gz
Source1: LICENSE
BuildArch: noarch
@ -20,16 +19,15 @@ BuildRequires: python2-devel
A puppet module for mtce
%prep
%autosetup -c %{module_dir}
%setup
#
# The src for this puppet module needs to be staged to puppet/modules
#
%install
install -d -m 0755 %{buildroot}%{_datadir}/puppet/modules/%{module_dir}
cp -R %{name}-%{version}/%{module_dir} %{buildroot}%{_datadir}/puppet/modules
make install \
MODULEDIR=%{buildroot}%{_datadir}/puppet/modules
%files
%license %{name}-%{version}/LICENSE
%license LICENSE
%{_datadir}/puppet/modules/%{module_dir}

9
puppet-modules-wrs/puppet-mtce/src/Makefile Normal file
View File

@ -0,0 +1,9 @@
#
# SPDX-License-Identifier: Apache-2.0
#
MODULEDIR ?= /usr/share/puppet/modules
install:
install -d -m 0755 $(MODULEDIR)/mtce
cp -R mtce/ $(MODULEDIR)/

8
puppet-modules-wrs/puppet-nfv/centos/puppet-nfv.spec
View File

@ -19,16 +19,16 @@ BuildRequires: python2-devel
A puppet module for nfv
%prep
%autosetup -c %{module_dir}
%setup
#
# The src for this puppet module needs to be staged to puppet/modules
#
%install
install -d -m 0755 %{buildroot}%{_datadir}/puppet/modules/%{module_dir}
cp -R %{name}-%{version}/%{module_dir} %{buildroot}%{_datadir}/puppet/modules
make install \
MODULEDIR=%{buildroot}%{_datadir}/puppet/modules
%files
%license %{name}-%{version}/LICENSE
%license LICENSE
%{_datadir}/puppet/modules/%{module_dir}

9
puppet-modules-wrs/puppet-nfv/src/Makefile Normal file
View File

@ -0,0 +1,9 @@
#
# SPDX-License-Identifier: Apache-2.0
#
MODULEDIR ?= /usr/share/puppet/modules
install:
install -d -m 0755 $(MODULEDIR)/nfv
cp -R nfv/ $(MODULEDIR)/

1
puppet-modules-wrs/puppet-nova_api_proxy/centos/build_srpm.data
View File

@ -1,3 +1,2 @@
SRC_DIR="src"
COPY_LIST="$SRC_DIR/LICENSE"
TIS_PATCH_VER=2

10
puppet-modules-wrs/puppet-nova_api_proxy/centos/puppet-nova_api_proxy.spec
View File

@ -10,7 +10,6 @@ Packager: Wind River <info@windriver.com>
URL: unknown
Source0: %{name}-%{version}.tar.gz
Source1: LICENSE
BuildArch: noarch
@ -20,16 +19,15 @@ BuildRequires: python2-devel
A puppet module for Nova API Proxy
%prep
%autosetup -c %{module_dir}
%setup
#
# The src for this puppet module needs to be staged to packstack/puppet/modules
#
%install
install -d -m 0755 %{buildroot}%{_datadir}/puppet/modules/%{module_dir}
cp -R %{name}-%{version}/%{module_dir} %{buildroot}%{_datadir}/puppet/modules
make install \
MODULEDIR=%{buildroot}%{_datadir}/puppet/modules
%files
%license %{name}-%{version}/LICENSE
%license LICENSE
%{_datadir}/puppet/modules/%{module_dir}

9
puppet-modules-wrs/puppet-nova_api_proxy/src/Makefile Normal file
View File

@ -0,0 +1,9 @@
#
# SPDX-License-Identifier: Apache-2.0
#
MODULEDIR ?= /usr/share/puppet/modules
install:
install -d -m 0755 $(MODULEDIR)/nova_api_proxy
cp -R nova_api_proxy/ $(MODULEDIR)/

9
puppet-modules-wrs/puppet-patching/centos/puppet-patching.spec
View File

@ -19,16 +19,15 @@ BuildRequires: python2-devel
A puppet module for patching
%prep
%autosetup -c %{module_dir}
%setup
#
# The src for this puppet module needs to be staged to packstack/puppet/modules
#
%install
install -d -m 0755 %{buildroot}%{_datadir}/puppet/modules/%{module_dir}
cp -R %{name}-%{version}/%{module_dir} %{buildroot}%{_datadir}/puppet/modules
make install \
MODULEDIR=%{buildroot}%{_datadir}/puppet/modules
%files
%license %{name}-%{version}/LICENSE
%license LICENSE
%{_datadir}/puppet/modules/%{module_dir}

9
puppet-modules-wrs/puppet-patching/src/Makefile Normal file
View File

@ -0,0 +1,9 @@
#
# SPDX-License-Identifier: Apache-2.0
#
MODULEDIR ?= /usr/share/puppet/modules
install:
install -d -m 0755 $(MODULEDIR)/patching
cp -R patching/ $(MODULEDIR)/

7
puppet-modules-wrs/puppet-smapi/centos/puppet-smapi.spec
View File

@ -19,14 +19,15 @@ BuildRequires: python2-devel
A puppet module for smapi
%prep
%autosetup -c %{module_dir}
%setup
#
# The src for this puppet module needs to be staged to puppet/modules
#
%install
install -d -m 0755 %{buildroot}%{_datadir}/puppet/modules/%{module_dir}
cp -R %{name}-%{version}/%{module_dir} %{buildroot}%{_datadir}/puppet/modules
make install \
MODULEDIR=%{buildroot}%{_datadir}/puppet/modules
%files
%license LICENSE
%{_datadir}/puppet/modules/%{module_dir}

9
puppet-modules-wrs/puppet-smapi/src/Makefile Normal file
View File

@ -0,0 +1,9 @@
#
# SPDX-License-Identifier: Apache-2.0
#
MODULEDIR ?= /usr/share/puppet/modules
install:
install -d -m 0755 $(MODULEDIR)/smapi
cp -R smapi/ $(MODULEDIR)/

1
puppet-modules-wrs/puppet-sshd/centos/build_srpm.data
View File

@ -1,3 +1,2 @@
SRC_DIR="src"
COPY_LIST="$SRC_DIR/LICENSE"
TIS_PATCH_VER=1

9
puppet-modules-wrs/puppet-sshd/centos/puppet-sshd.spec
View File

@ -10,7 +10,6 @@ Packager: Wind River <info@windriver.com>
URL: unknown
Source0: %{name}-%{version}.tar.gz
Source1: LICENSE
BuildArch: noarch
@ -20,15 +19,15 @@ BuildRequires: python2-devel
A puppet module for sshd
%prep
%autosetup -c %{module_dir}
%setup
#
# The src for this puppet module needs to be staged to puppet/modules
#
%install
install -d -m 0755 %{buildroot}%{_datadir}/puppet/modules/%{module_dir}
cp -R %{name}-%{version}/%{module_dir} %{buildroot}%{_datadir}/puppet/modules
make install \
MODULEDIR=%{buildroot}%{_datadir}/puppet/modules
%files
%license %{name}-%{version}/LICENSE
%license LICENSE
%{_datadir}/puppet/modules/%{module_dir}

9
puppet-modules-wrs/puppet-sshd/src/Makefile Normal file
View File

@ -0,0 +1,9 @@
# SPDX-License-Identifier: Apache-2.0
#
MODULEDIR ?= /usr/share/puppet/modules
install:
install -d -m 0755 $(MODULEDIR)/sshd
cp -R sshd/ $(MODULEDIR)/

1
puppet-modules-wrs/puppet-sysinv/centos/build_srpm.data
View File

@ -1,3 +1,2 @@
SRC_DIR="src"
COPY_LIST="$SRC_DIR/LICENSE"
TIS_PATCH_VER=4

9
puppet-modules-wrs/puppet-sysinv/centos/puppet-sysinv.spec
View File

@ -10,7 +10,6 @@ Packager: Wind River <info@windriver.com>
URL: unknown
Source0: %{name}-%{version}.tar.gz
Source1: LICENSE
BuildArch: noarch
@ -20,16 +19,16 @@ BuildRequires: python2-devel
A puppet module for sysinv
%prep
%autosetup -c %{module_dir}
%setup
#
# The src for this puppet module needs to be staged to puppet/modules
#
%install
install -d -m 0755 %{buildroot}%{_datadir}/puppet/modules/%{module_dir}
cp -R %{name}-%{version}/%{module_dir} %{buildroot}%{_datadir}/puppet/modules
make install \
MODULEDIR=%{buildroot}%{_datadir}/puppet/modules
%files
%license %{name}-%{version}/LICENSE
%license LICENSE
%{_datadir}/puppet/modules/%{module_dir}

9
puppet-modules-wrs/puppet-sysinv/src/Makefile Normal file
View File

@ -0,0 +1,9 @@
#
# SPDX-License-Identifier: Apache-2.0
#
MODULEDIR ?= /usr/share/puppet/modules
install:
install -d -m 0755 $(MODULEDIR)/sysinv
cp -R sysinv/ $(MODULEDIR)/