Rename cilium-net-daemon service to cilium

The long name only complicates usability. Signed-off-by: <thomas@cilium.io>
cilium · Mar 3, 2017 · a5bca4c · a5bca4c
1 parent eed8cf2
commit a5bca4c
Show file tree

Hide file tree

Showing 15 changed files with 33 additions and 39 deletions.
diff --git a/Vagrantfile b/Vagrantfile
@@ -28,8 +28,7 @@ sudo -E make -C /home/vagrant/go/src/github.com/cilium/cilium/ install
 
 if [ -n "$(grep DISTRIB_RELEASE=14.04 /etc/lsb-release)" ]; then
     sudo cp /home/vagrant/go/src/github.com/cilium/cilium/contrib/upstart/cilium-docker.conf /etc/init/
-    sudo cp /home/vagrant/go/src/github.com/cilium/cilium/contrib/upstart/cilium-net-daemon.conf /etc/init/
-    sudo cp /home/vagrant/go/src/github.com/cilium/cilium/contrib/upstart/cilium-socket-proxy.conf /etc/init/
+    sudo cp /home/vagrant/go/src/github.com/cilium/cilium/contrib/upstart/cilium.conf /etc/init/
     sudo cp /home/vagrant/go/src/github.com/cilium/cilium/contrib/upstart/cilium-consul.conf /etc/init/
     sudo cp /home/vagrant/go/src/github.com/cilium/cilium/contrib/upstart/cilium-policy-watcher.conf /etc/init/
     sudo cp /home/vagrant/go/src/github.com/cilium/cilium/contrib/upstart/cilium-etcd.conf /etc/init/
@@ -39,7 +38,7 @@ else
     sudo cp /home/vagrant/go/src/github.com/cilium/cilium/contrib/systemd/cilium-consul.service /lib/systemd/system
     sudo cp /home/vagrant/go/src/github.com/cilium/cilium/contrib/systemd/cilium-docker.service /lib/systemd/system
     sudo cp /home/vagrant/go/src/github.com/cilium/cilium/contrib/systemd/cilium-etcd.service /lib/systemd/system
-    sudo cp /home/vagrant/go/src/github.com/cilium/cilium/contrib/systemd/cilium-net-daemon.service /lib/systemd/system
+    sudo cp /home/vagrant/go/src/github.com/cilium/cilium/contrib/systemd/cilium.service /lib/systemd/system
     sudo cp /home/vagrant/go/src/github.com/cilium/cilium/contrib/systemd/cilium /etc/sysconfig
 fi
 

diff --git a/contrib/packaging/deb/cfg/debian/rules b/contrib/packaging/deb/cfg/debian/rules
@@ -20,7 +20,7 @@ override_dh_auto_install:
 	cp contrib/upstart/* "$(DESTDIR)/etc/init"
 	apt-get install -y gettext-base
 	sed 's+env.*+env PATH=/usr/lib/llvm-3.8/bin:/usr/local/sbin:/usr/local/bin:/usr/bin:/usr/sbin:/sbin:/bin+g' \
-	 "contrib/upstart/cilium-net-daemon.conf" > "$(DESTDIR)/etc/init/cilium-net-daemon.conf"
+	 "contrib/upstart/cilium.conf" > "$(DESTDIR)/etc/init/cilium.conf"
 	chmod 644 $(DESTDIR)/etc/init/*
 
 

diff --git a/contrib/packaging/rpm/cfg/cilium.spec b/contrib/packaging/rpm/cfg/cilium.spec
@@ -43,14 +43,13 @@ chmod 644 %{buildroot}/etc/init/*
 /etc/init/cilium-consul.conf
 /etc/init/cilium-docker.conf
 /etc/init/cilium-etcd.conf
-/etc/init/cilium-net-daemon.conf
+/etc/init/cilium.conf
 /etc/init/cilium-policy-watcher.conf
-/etc/init/cilium-socket-proxy.conf
 /etc/sysconfig/cilium
 /lib/systemd/system/cilium-consul.service
 /lib/systemd/system/cilium-docker.service
 /lib/systemd/system/cilium-etcd.service
-/lib/systemd/system/cilium-net-daemon.service
+/lib/systemd/system/cilium.service
 /opt/cni/bin/cilium-cni
 /usr/bin/cilium
 /usr/bin/cilium-docker

diff --git a/contrib/systemd/cilium-net-daemon.service → contrib/systemd/cilium.service b/contrib/systemd/cilium-net-daemon.service → contrib/systemd/cilium.service
@@ -1,5 +1,5 @@
 [Unit]
-Description=cilium-net-daemon
+Description=cilium
 Documentation=https://github.com/cilium/cilium
 Requires=docker.service cilium-consul.service cilium-docker.service
 

diff --git a/contrib/upstart/cilium-consul.conf b/contrib/upstart/cilium-consul.conf
@@ -1,4 +1,4 @@
-start on starting cilium-net-daemon
+start on starting cilium
 
 pre-start script
 	if docker ps -f status=exited | grep cilium-consul; then

diff --git a/contrib/upstart/cilium-docker.conf b/contrib/upstart/cilium-docker.conf
@@ -1,4 +1,4 @@
-start on (started cilium-net-daemon)
-stop on stopped cilium-net-daemon
+start on (started cilium)
+stop on stopped cilium
 
 exec cilium-docker
diff --git a/contrib/upstart/cilium-etcd.conf b/contrib/upstart/cilium-etcd.conf
@@ -1,4 +1,4 @@
-start on starting cilium-net-daemon
+start on starting cilium
 
 pre-start script
 	if docker ps -f status=exited | grep cilium-etcd; then

diff --git a/contrib/upstart/cilium-socket-proxy.conf b/contrib/upstart/cilium-socket-proxy.conf
diff --git a/contrib/upstart/cilium-net-daemon.conf → contrib/upstart/cilium.conf b/contrib/upstart/cilium-net-daemon.conf → contrib/upstart/cilium.conf
diff --git a/contrib/vagrant/start.sh b/contrib/vagrant/start.sh
@@ -114,19 +114,19 @@ function write_footer() {
 	    cat <<EOF >> "$filename"
 sleep 2s
 if [ -n "\$(grep DISTRIB_RELEASE=14.04 /etc/lsb-release)" ]; then
-    sed -i '/exec/d' /etc/init/cilium-net-daemon.conf
-    echo 'script' >> /etc/init/cilium-net-daemon.conf
-    echo 'cilium lb init 2001:db8:aaaa::1 f00d::' >> /etc/init/cilium-net-daemon.conf
-    echo 'exec cilium-agent --debug ${k8s_options}-n ${ipv6_addr} ${ipv4_options}--lb ${TUNNEL_MODE_STRING} --consul "${NODE_IP_BASE}${FIRST_IP_SUFFIX}:8500"' >> /etc/init/cilium-net-daemon.conf
-    echo 'end script' >> /etc/init/cilium-net-daemon.conf
-    service cilium-net-daemon restart
+    sed -i '/exec/d' /etc/init/ciliumt.conf
+    echo 'script' >> /etc/init/cilium.conf
+    echo 'cilium lb init 2001:db8:aaaa::1 f00d::' >> /etc/init/cilium.conf
+    echo 'exec cilium-agent --debug ${k8s_options}-n ${ipv6_addr} ${ipv4_options}--lb ${TUNNEL_MODE_STRING} --consul "${NODE_IP_BASE}${FIRST_IP_SUFFIX}:8500"' >> /etc/init/cilium.conf
+    echo 'end script' >> /etc/init/cilium.conf
+    service cilium restart
 else
-    sed -i '9s+.*+ExecStart=/usr/bin/cilium-agent --debug \$CILIUM_OPTS+' /lib/systemd/system/cilium-net-daemon.service
-    sed -i '9i ExecPreStart=/usr/bin/cilium lb init 2001:db8:aaaa::1 f00d::' /lib/systemd/system/cilium-net-daemon.service
+    sed -i '9s+.*+ExecStart=/usr/bin/cilium-agent --debug \$CILIUM_OPTS+' /lib/systemd/system/cilium.service
+    sed -i '9i ExecPreStart=/usr/bin/cilium lb init 2001:db8:aaaa::1 f00d::' /lib/systemd/system/cilium.service
     echo 'CILIUM_OPTS=${k8s_options}-n ${ipv6_addr} ${ipv4_options}--lb ${TUNNEL_MODE_STRING} --consul "${NODE_IP_BASE}${FIRST_IP_SUFFIX}:8500"' >> /etc/sysconfig/cilium
     echo 'PATH=/usr/local/clang/bin:/usr/local/sbin:/usr/local/bin:/usr/bin:/usr/sbin:/sbin:/bin' >> /etc/sysconfig/cilium
     echo 'INITSYSTEM=SYSTEMD' >> /etc/sysconfig/cilium
-    systemctl restart cilium-net-daemon.service
+    systemctl restart cilium.service
 fi
 for ((i = 0 ; i < 24; i++)); do
     if cilium status > /dev/null 2>&1; then
@@ -140,14 +140,14 @@ EOF
 	    cat <<EOF >> "$filename"
 sleep 2s
 if [ -n "\$(grep DISTRIB_RELEASE=14.04 /etc/lsb-release)" ]; then
-    sed -i '/exec/d' /etc/init/cilium-net-daemon.conf
-    echo 'exec cilium-agent --debug ${k8s_options}-n ${ipv6_addr} ${ipv4_options}${TUNNEL_MODE_STRING} --consul "${NODE_IP_BASE}${FIRST_IP_SUFFIX}:8500"' >> /etc/init/cilium-net-daemon.conf
-    service cilium-net-daemon restart
+    sed -i '/exec/d' /etc/init/cilium.conf
+    echo 'exec cilium-agent --debug ${k8s_options}-n ${ipv6_addr} ${ipv4_options}${TUNNEL_MODE_STRING} --consul "${NODE_IP_BASE}${FIRST_IP_SUFFIX}:8500"' >> /etc/init/cilium.conf
+    service cilium restart
 else
-    sed -i '9s+.*+ExecStart=/usr/bin/cilium-agent --debug \$CILIUM_OPTS+' /lib/systemd/system/cilium-net-daemon.service
+    sed -i '9s+.*+ExecStart=/usr/bin/cilium-agent --debug \$CILIUM_OPTS+' /lib/systemd/system/cilium.service
     echo 'CILIUM_OPTS=${k8s_options}-n ${ipv6_addr} ${ipv4_options}--lb ${TUNNEL_MODE_STRING} --consul "${NODE_IP_BASE}${FIRST_IP_SUFFIX}:8500"' >> /etc/sysconfig/cilium
     echo 'PATH=/usr/local/clang/bin:/usr/local/sbin:/usr/local/bin:/usr/bin:/usr/sbin:/sbin:/bin' >> /etc/sysconfig/cilium
-    systemctl restart cilium-net-daemon.service
+    systemctl restart cilium.service
 fi
 for ((i = 0 ; i < 24; i++)); do
     if cilium status > /dev/null 2>&1; then

diff --git a/doc/installation.md b/doc/installation.md
@@ -25,7 +25,7 @@ and upstart can be found in the [`contrib`](../contrib) directory.
 
 
 ```
-service cilium-net-daemon start
+service cilium start
 ```
 
 ## Integration with existing networking

diff --git a/doc/vagrant.md b/doc/vagrant.md
@@ -55,7 +55,7 @@ and manually install Cilium:
   $ sudo make install
   $ sudo cp contrib/upstart/* /etc/init/
   $ sudo usermod -a -G cilium vagrant
-  $ sudo service cilium-net-daemon restart
+  $ sudo service cilium restart
   ```
 
 ## (Re)building the box

diff --git a/examples/docker-compose/README.md b/examples/docker-compose/README.md
@@ -24,12 +24,12 @@ Download the `docker-compose.yml` [here](https://raw.githubusercontent.com/ciliu
 ### Vagrant users: Stop existing cilium and consul instance
 
 If you are running the vagrant box. The Vagrantfile will have automatically
-started both a consul container and the cilium-net service managed by upstart.
+started both a consul container and the cilium service managed by upstart.
 You need to stop both:
 
 ```
 docker rm -f cilium-consul
-sudo service cilium-net-daemon stop
+sudo service cilium stop
 ```
 
 ### Run docker-compose

diff --git a/examples/elk/README.md b/examples/elk/README.md
@@ -13,11 +13,11 @@ This tutorial will show you how you you can retrieve cilium statistics with ELK
 Download the `docker-compose.yml` [here](docker-compose.yml) and check if the set up ports
 collide with other services running in your machine.
 
-### Edit your `cilium-net-daemon.conf` or your docker-compose.yml cilium file
+### Edit the `cilium.conf` or docker-compose.yml cilium file
 
-If your are running cilium as standalone edit your `/etc/init/cilium-net-daemon.conf` file
+If your are running cilium as standalone edit your `/etc/init/cilium.conf` file
 and add the `--logstash` flag to point to the logstash address and port that you set up on the
-previous step and after editing restart the `cilium-net-daemon` service.
+previous step and after editing restart the `cilium` service.
 
 ```
 exec cilium-agent --logstash 192.168.33.21:9302

diff --git a/tests/manual-multi-node.bash b/tests/manual-multi-node.bash
@@ -64,8 +64,8 @@ function test_nodes {
 	echo "Setting up nodes with options: $OPTS"
 	echo "------------------------------------------------------------------------"
 
-	node_run cilium-master "sudo cp /etc/init/cilium-net-daemon.conf tmp; sudo sed -i '/exec/d' tmp; echo \"exec cilium-agent --debug -n f00d::c0a8:210b:0:0 --ipv4-range 10.1.0.1 $OPTS\" | sudo tee -a tmp; sudo cp tmp /etc/init/cilium-net-daemon.conf; sudo service cilium-net-daemon restart"
-	node_run cilium-node-2 "sudo cp /etc/init/cilium-net-daemon.conf tmp; sudo sed -i '/exec/d' tmp; echo \"exec cilium-agent --debug -n f00d::c0a8:210c:0:0 --ipv4-range 10.2.0.1 $OPTS -c 192.168.33.11:8500\" | sudo tee -a tmp; sudo cp tmp /etc/init/cilium-net-daemon.conf; sudo service cilium-net-daemon restart"
+	node_run cilium-master "sudo cp /etc/init/cilium.conf tmp; sudo sed -i '/exec/d' tmp; echo \"exec cilium-agent --debug -n f00d::c0a8:210b:0:0 --ipv4-range 10.1.0.1 $OPTS\" | sudo tee -a tmp; sudo cp tmp /etc/init/cilium.conf; sudo service cilium restart"
+	node_run cilium-node-2 "sudo cp /etc/init/cilium.conf tmp; sudo sed -i '/exec/d' tmp; echo \"exec cilium-agent --debug -n f00d::c0a8:210c:0:0 --ipv4-range 10.2.0.1 $OPTS -c 192.168.33.11:8500\" | sudo tee -a tmp; sudo cp tmp /etc/init/cilium.conf; sudo service cilium restart"
 
 	echo "Waiting for daemon to start up..."
 	sleep 5s