vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Add support to configure crio storage

Browse source 
Implement crio-storage-setup.service which executes container-storage-setup
to configure COW Storage.

If you use this script you are requiring container-storage-setup to be
installed.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
This commit is contained in:
Daniel J Walsh 2017-07-24 12:39:12 -04:00
parent 1aa0d5da86
commit d7055aaf17
4 changed files with 25 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -154,6 +154,8 @@ install.systemd:
install -D -m 644 contrib/systemd/crio.service $(PREFIX)/lib/systemd/system/crio.service install -D -m 644 contrib/systemd/crio.service $(PREFIX)/lib/systemd/system/crio.service
install -D -m 644 contrib/systemd/crio-shutdown.service $(PREFIX)/lib/systemd/system/crio-shutdown.service install -D -m 644 contrib/systemd/crio-shutdown.service $(PREFIX)/lib/systemd/system/crio-shutdown.service
ln -s crio.service $(PREFIX)/lib/systemd/system/cri-o.service ln -s crio.service $(PREFIX)/lib/systemd/system/cri-o.service
install -D -m 644 contrib/systemd/crio-storage-setup.service $(PREFIX)/lib/systemd/system/crio-storage-setup.service
install -D -m 644 contrib/systemd/crio-storage-setup.default ${ETCDIR}/sysconfig/crio-storage-setup
uninstall: uninstall:
rm -f $(BINDIR)/crio rm -f $(BINDIR)/crio

4
contrib/rpm/crio.spec
View file

@ -21,6 +21,7 @@ Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcomm
Provides: %{repo} Provides: %{repo}
BuildRequires: golang-github-cpuguy83-go-md2man BuildRequires: golang-github-cpuguy83-go-md2man
Requires: container-storage-setup >= 0.6
%description %description
The crio package provides an implementation of the The crio package provides an implementation of the
@ -57,6 +58,9 @@ make all
/%{_libexecdir}/crio/conmon /%{_libexecdir}/crio/conmon
/%{_libexecdir}/crio/pause /%{_libexecdir}/crio/pause
%{_unitdir}/crio.service %{_unitdir}/crio.service
%{_unitdir}/crio-storage-setup.service
%{_sysconfdir}/sysconfig/crio-storage-setup
%ghost %{_sysconfdir}/sysconfig/crio-storage
%doc README.md %doc README.md
%license LICENSE %license LICENSE

5
contrib/systemd/crio-storage-setup.default Normal file
View file

@ -0,0 +1,5 @@
# Edit this file to override any configuration options specified in
# /usr/share/container-storage-setup/container-storage-setup.
#
# For more details refer to "man container-storage-setup"
STORAGE_DRIVER=overlay

14
contrib/systemd/crio-storage-setup.service Normal file
View file

@ -0,0 +1,14 @@
[Unit]
Description=Open Container Initiative Daemon Storage Setup
Documentation=https://github.com/kubernetes-incubator/cri-o
After=cloud-init.service
Before=crio.service
[Service]
Type=oneshot
ExecStartPre=-/usr/bin/container-storage-setup create -o /etc/sysconfig/crio-storage crio-storage /etc/sysconfig/crio-storage-setup
ExecStart=/usr/bin/container-storage-setup activate crio-storage
ExecStop=/usr/bin/container-storage-setup deactivate crio-storage
[Install]
WantedBy=multi-user.target