Rename ocid to crio.

The ocid project was renamed to CRI-O, months ago, it is time that we moved
all of the code to the new name.  We want to elminate the name ocid from use.
Move fully to crio.

Also cric is being renamed to crioctl for the time being.

Signed-off-by: Dan Walsh <dwalsh@redhat.com>

contrib/cni/10-ocid-bridge.conf

@@ -1,6 +1,6 @@
 {
     "cniVersion": "0.2.0",
-    "name": "ocid-bridge",
+    "name": "crio-bridge",
     "type": "bridge",
     "bridge": "cni0",
     "isGateway": true,

contrib/cni/README.md

@@ -6,10 +6,10 @@ basis for your own configurations (distibutions should package these files in
 example directories).
 
 To use these configurations, place them in `/etc/cni/net.d` (or the directory
-specified by `ocid.network.network_dir` in your `ocid.conf`).
+specified by `crio.network.network_dir` in your `crio.conf`).
 
 In addition, you need to install the [CNI plugins][cni] necessary into
-`/opt/cni/bin` (or the directory specified by `ocid.network.plugin_dir`). The
+`/opt/cni/bin` (or the directory specified by `crio.network.plugin_dir`). The
 two plugins necessary for the example CNI configurations are `loopback` and
 `bridge`.
 

contrib/rpm/Makefile

@@ -1,11 +1,11 @@
 .PHONY: dist
-dist: ocid.spec
-	spectool -g ocid.spec
+dist: crio.spec
+	spectool -g crio.spec
 
 .PHONY: rpm
 rpm: dist
 	rpmbuild --define "_sourcedir `pwd`" --define "_specdir `pwd`" \
-	--define "_rpmdir `pwd`" --define "_srcrpmdir `pwd`" -ba ocid.spec
+	--define "_rpmdir `pwd`" --define "_srcrpmdir `pwd`" -ba crio.spec
 
 all: rpm
 

contrib/rpm/crio.spec

@@ -3,7 +3,7 @@
 %global provider_tld    com
 %global project         kubernetes-incubator
 %global repo            cri-o
-%global Name            ocid
+%global Name            crio
 # https://github.com/kubernetes-incubator/cri-o
 %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
 %global import_path     %{provider_prefix}
@@ -22,10 +22,10 @@ Source0:        https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcomm
 BuildRequires:  golang-github-cpuguy83-go-md2man
 
 %description
-The ocid package provides an implementation of the
+The crio package provides an implementation of the
 Kubelet Container Runtime Interface (CRI) using OCI conformant runtimes.
 
-ocid provides following functionalities:
+crio provides following functionalities:
 
     Support multiple image formats including the existing Docker image format
     Support for multiple means to download images including trust & image verification
@@ -47,15 +47,15 @@ make all
 #define license tag if not already defined
 %{!?_licensedir:%global license %doc}
 %files
-%{_bindir}/ocid
-%{_bindir}/ocic
-%{_mandir}/man5/ocid.conf.5*
-%{_mandir}/man8/ocid.8*
-%{_sysconfdir}/ocid.conf
-%dir /%{_libexecdir}/ocid
-/%{_libexecdir}/ocid/conmon
-/%{_libexecdir}/ocid/pause
-%{_unitdir}/ocid.service
+%{_bindir}/crio
+%{_bindir}/crioctl
+%{_mandir}/man5/crio.conf.5*
+%{_mandir}/man8/crio.8*
+%{_sysconfdir}/crio.conf
+%dir /%{_libexecdir}/crio
+/%{_libexecdir}/crio/conmon
+/%{_libexecdir}/crio/pause
+%{_unitdir}/crio.service
 %doc README.md
 %license LICENSE
 

contrib/systemd/crio-shutdown.service

@@ -1,13 +1,13 @@
 [Unit]
 Description=Shutdown OCID containers before shutting down the system
-Wants=ocid.service
-After=ocid.service
-Documentation=man:ocid(8)
+Wants=crio.service
+After=crio.service
+Documentation=man:crio(8)
 
 [Service]
 Type=oneshot
 ExecStart=/usr/bin/true
-ExecStop=mkdir -p /var/lib/ocid; touch /var/lib/ocid/ocid.shutdown
+ExecStop=mkdir -p /var/lib/crio; touch /var/lib/crio/crio.shutdown
 RemainAfterExit=yes
 
 [Install]

contrib/systemd/crio.service

@@ -5,10 +5,10 @@ After=network.target
 
 [Service]
 Type=notify
-EnvironmentFile=-/etc/sysconfig/ocid-storage
-EnvironmentFile=-/etc/sysconfig/ocid-network
+EnvironmentFile=-/etc/sysconfig/crio-storage
+EnvironmentFile=-/etc/sysconfig/crio-network
 Environment=GOTRACEBACK=crash
-ExecStart=/usr/local/bin/ocid \
+ExecStart=/usr/local/bin/crio \
           $OCID_STORAGE_OPTIONS \
           $OCID_NETWORK_OPTIONS \
 ExecReload=/bin/kill -s HUP $MAINPID