starlingx
/
config
Code Issues Proposed changes

Merge "Adding makefile for puppet-manifests"

This commit is contained in:
Zuul 2019-02-04 13:22:30 +00:00 committed by Gerrit Code Review
parent a3c261a3aa 272f6a8605
commit f8345ab079
2 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
puppet-manifests/centos/puppet-manifests.spec
View File

@ -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,-)

18
puppet-manifests/src/Makefile Normal file
View File

@ -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)/