diff --git a/puppet-manifests/centos/puppet-manifests.spec b/puppet-manifests/centos/puppet-manifests.spec index 410fbabb2b..407850ee6c 100644 --- a/puppet-manifests/centos/puppet-manifests.spec +++ b/puppet-manifests/centos/puppet-manifests.spec @@ -88,15 +88,10 @@ Platform puppet configuration files and manifests %setup %install -install -m 755 -D bin/puppet-manifest-apply.sh %{buildroot}%{local_bindir}/puppet-manifest-apply.sh -install -m 755 -D bin/apply_network_config.sh %{buildroot}%{local_bindir}/apply_network_config.sh -install -d -m 0755 %{buildroot}%{config_dir} -install -m 640 etc/hiera.yaml %{buildroot}%{config_dir} -cp -R hieradata %{buildroot}%{config_dir} -cp -R manifests %{buildroot}%{config_dir} -install -d -m 0755 %{buildroot}%{module_dir} -cp -R modules/platform %{buildroot}%{module_dir} -cp -R modules/openstack %{buildroot}%{module_dir} +make install \ + BINDIR=%{buildroot}%{local_bindir} \ + CONFIGDIR=%{buildroot}%{config_dir} \ + MODULEDIR=%{buildroot}%{module_dir} %files %defattr(-,root,root,-) diff --git a/puppet-manifests/src/Makefile b/puppet-manifests/src/Makefile new file mode 100644 index 0000000000..cd7ced8538 --- /dev/null +++ b/puppet-manifests/src/Makefile @@ -0,0 +1,18 @@ +# +# SPDX-License-Identifier: Apache-2.0 +# + +BINDIR ?= /usr/local/bin +CONFIGDIR ?= /etc/puppet +MODULEDIR ?= /usr/share/puppet/modules + +install: + install -m 755 -D bin/puppet-manifest-apply.sh $(BINDIR)/puppet-manifest-apply.sh + install -m 755 -D bin/apply_network_config.sh $(BINDIR)/apply_network_config.sh + install -d -m 0755 $(CONFIGDIR) + install -m 640 etc/hiera.yaml $(CONFIGDIR)/ + cp -R hieradata $(CONFIGDIR)/ + cp -R manifests $(CONFIGDIR)/ + install -d -m 0755 $(MODULEDIR) + cp -R modules/platform $(MODULEDIR)/ + cp -R modules/openstack $(MODULEDIR)/