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

Update the default conmonPath

Browse source 
After change in `Makefile` at #304 where `PREFIX`
has changed from `/usr` to `/usr/local` these changes
has to be reflected in default `conmonPath`.

Signed-off-by: Suraj Deshmukh <surajssd009005@gmail.com>
This commit is contained in:
Suraj Deshmukh 2017-03-29 19:47:38 +05:30
parent f2ce1fff0a
commit c93c7cd1b8
5 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docs/ocid.8.md
View file

@ -54,7 +54,7 @@ ocid is meant to provide an integration path between OCI conformant runtimes and
path to configuration file path to configuration file
**--conmon**="" **--conmon**=""
path to the conmon executable (default: "/usr/libexec/ocid/conmon") path to the conmon executable (default: "/usr/local/libexec/ocid/conmon")
**--debug** **--debug**
Enable debug output for logging Enable debug output for logging

2
docs/ocid.conf.5.md
View file

@ -49,7 +49,7 @@ The `ocid` table supports the following options:
## OCID.RUNTIME TABLE ## OCID.RUNTIME TABLE
**conmon**="" **conmon**=""
Path to the conmon executable (default: "/usr/libexec/ocid/conmon") Path to the conmon executable (default: "/usr/local/libexec/ocid/conmon")
**conmon_env**=[] **conmon_env**=[]
Environment variable list for conmon process (default: ["PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",]) Environment variable list for conmon process (default: ["PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",])

18
kubernetes.md
View file

@ -15,15 +15,15 @@ Below, you can find an instruction how to switch one or more nodes on running ku
You must prepare and install `ocid` on each node you would like to switch. Here's the list of files that must be provided: You must prepare and install `ocid` on each node you would like to switch. Here's the list of files that must be provided:
| File path | Description | Location | | File path | Description | Location |
|--------------------------------------|----------------------------|-----------------------------------------------------| |--------------------------------------------|----------------------------|-----------------------------------------------------|
| `/etc/ocid/ocid.conf` | ocid configuration | Generated on cri-o `make install` | | `/etc/ocid/ocid.conf` | ocid configuration | Generated on cri-o `make install` |
| `/etc/ocid/seccomp.conf` | seccomp config | Example stored in cri-o repository | | `/etc/ocid/seccomp.conf` | seccomp config | Example stored in cri-o repository |
| `/etc/containers/policy.json` | containers policy | Example stored in cri-o repository | | `/etc/containers/policy.json` | containers policy | Example stored in cri-o repository |
| `/bin/{ocid, runc}` | `ocid` and `runc` binaries | Built from cri-o repository | | `/bin/{ocid, runc}` | `ocid` and `runc` binaries | Built from cri-o repository |
| `/usr/libexec/ocid/conmon` | `conmon` binary | Built from cri-o repository | | `/usr/local/libexec/ocid/conmon` | `conmon` binary | Built from cri-o repository |
| `/opt/cni/bin/{flannel, bridge,...}` | CNI plugins binaries | Can be built from sources `containernetworking/cni` | | `/opt/cni/bin/{flannel, bridge,...}` | CNI plugins binaries | Can be built from sources `containernetworking/cni` |
| `/etc/cni/net.d/10-mynet.conf` | Network config | Example stored in [README file](README.md) | | `/etc/cni/net.d/10-mynet.conf` | Network config | Example stored in [README file](README.md) |
`ocid` binary can be executed directly on host, inside the container or in any way. `ocid` binary can be executed directly on host, inside the container or in any way.
However, recommended way is to set it as a systemd service. However, recommended way is to set it as a systemd service.

2
server/config.go
View file

@ -12,7 +12,7 @@ import (
const ( const (
ocidRoot = "/var/lib/containers/storage" ocidRoot = "/var/lib/containers/storage"
ocidRunRoot = "/var/run/containers/storage" ocidRunRoot = "/var/run/containers/storage"
conmonPath = "/usr/libexec/ocid/conmon" conmonPath = "/usr/local/libexec/ocid/conmon"
pauseImage = "kubernetes/pause" pauseImage = "kubernetes/pause"
pauseCommand = "/pause" pauseCommand = "/pause"
defaultTransport = "docker://" defaultTransport = "docker://"

2
tutorial.md
View file

@ -132,7 +132,7 @@ Output:
install -D -m 755 kpod /usr/bin/kpod install -D -m 755 kpod /usr/bin/kpod
install -D -m 755 ocid /usr/bin/ocid install -D -m 755 ocid /usr/bin/ocid
install -D -m 755 ocic /usr/bin/ocic install -D -m 755 ocic /usr/bin/ocic
install -D -m 755 conmon/conmon /usr/libexec/ocid/conmon install -D -m 755 conmon/conmon /usr/local/libexec/ocid/conmon
install -D -m 755 pause/pause /usr/libexec/ocid/pause install -D -m 755 pause/pause /usr/libexec/ocid/pause
install -d -m 755 /usr/share/man/man{1,5,8} install -d -m 755 /usr/share/man/man{1,5,8}
install -m 644 docs/kpod.1 docs/kpod-launch.1 -t /usr/share/man/man1 install -m 644 docs/kpod.1 docs/kpod-launch.1 -t /usr/share/man/man1