openstack
/
murano-apps
Code Issues Proposed changes

Merge "[Docker] Fix upstart ans sysvinit scripts for ubuntu"

This commit is contained in:
Jenkins 2016-08-10 08:56:12 +00:00 committed by Gerrit Code Review
parent 19c928718b 84d3c20411
commit 593d92d023
15 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/default_scripts/kube-apiserver
View File

@ -1,7 +1,7 @@
#Kube-Apiserver Upstart and SysVinit configuration file
# Customize kube-apiserver binary location
KUBE_APISERVER="/opt/bin/hyperkube apiserver"
KUBE_APISERVER="/opt/bin/hyperkube"
# Use KUBE_APISERVER_OPTS to modify the start/restart options
KUBE_APISERVER_OPTS="--address=0.0.0.0 \

2
Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/default_scripts/kube-controller-manager
View File

@ -1,7 +1,7 @@
# Kube-Controller-Manager Upstart and SysVinit configuration file
# Customize kube-controller-manager binary location
KUBE_CONTROLLER_MANAGER="/opt/bin/hyperkube controller-manager"
KUBE_CONTROLLER_MANAGER="/opt/bin/hyperkube"
# Use KUBE_CONTROLLER_MANAGER_OPTS to modify the start/restart options
KUBE_CONTROLLER_MANAGER_OPTS="--master=127.0.0.1:8080 \

2
Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/default_scripts/kube-proxy
View File

@ -1,7 +1,7 @@
# Kube-Proxy Upstart and SysVinit configuration file
# Customize kube-proxy binary location
KUBE_PROXY="/opt/bin/hyperkube proxy"
KUBE_PROXY="/opt/bin/hyperkube"
# Use KUBE_PROXY_OPTS to modify the start/restart options
KUBE_PROXY_OPTS="--logtostderr=false --master=http://%%MASTER_IP%%:8080 --log_dir=/var/log/kubernetes"

2
Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/default_scripts/kube-scheduler
View File

@ -1,7 +1,7 @@
# Kube-Scheduler Upstart and SysVinit configuration file
# Customize kube-apiserver binary location
KUBE_SCHEDULER="/opt/bin/hyperkube scheduler"
KUBE_SCHEDULER="/opt/bin/hyperkube"
# Use KUBE_SCHEDULER_OPTS to modify the start/restart options
KUBE_SCHEDULER_OPTS="--logtostderr=false --log_dir=/var/log/kubernetes \

2
Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/default_scripts/kubelet
View File

@ -1,7 +1,7 @@
# Kubelet Upstart and SysVinit configuration file
# Customize kubelet binary location
KUBELET="/opt/bin/hyperkube kubelet"
KUBELET="/opt/bin/hyperkube"
# Use KUBELET_OPTS to modify the start/restart options
KUBELET_OPTS="--address=%%IP%% \

4
Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/init_conf/kube-apiserver.conf
View File

@ -9,7 +9,7 @@ stop on stopping etcd
pre-start script
# see also https://github.com/jainvipin/kubernetes-start
KUBE_APISERVER=/opt/bin/hyperkube apiserver
KUBE_APISERVER=/opt/bin/$UPSTART_JOB
if [ -f /etc/default/$UPSTART_JOB ]; then
. /etc/default/$UPSTART_JOB
fi
@ -26,7 +26,7 @@ script
if [ -f /etc/default/$UPSTART_JOB ]; then
. /etc/default/$UPSTART_JOB
fi
exec "$KUBE_APISERVER" $KUBE_APISERVER_OPTS
exec $KUBE_APISERVER apiserver $KUBE_APISERVER_OPTS
end script
start on runlevel [235]

4
Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/init_conf/kube-controller-manager.conf
View File

@ -9,7 +9,7 @@ stop on stopping etcd
pre-start script
# see also https://github.com/jainvipin/kubernetes-ubuntu-start
KUBE_CONTROLLER_MANAGER=/opt/bin/hyperkube controller-manager
KUBE_CONTROLLER_MANAGER=/opt/bin/$UPSTART_JOB
if [ -f /etc/default/$UPSTART_JOB ]; then
. /etc/default/$UPSTART_JOB
fi
@ -26,7 +26,7 @@ script
if [ -f /etc/default/$UPSTART_JOB ]; then
. /etc/default/$UPSTART_JOB
fi
exec "$KUBE_CONTROLLER_MANAGER" $KUBE_CONTROLLER_MANAGER_OPTS
exec $KUBE_CONTROLLER_MANAGER controller-manager $KUBE_CONTROLLER_MANAGER_OPTS
end script
start on runlevel [235]

4
Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/init_conf/kube-proxy.conf
View File

@ -9,7 +9,7 @@ stop on stopping etcd
pre-start script
# see also https://github.com/jainvipin/kubernetes-start
KUBE_PROXY=/opt/bin/hyperkube proxy
KUBE_PROXY=/opt/bin/$UPSTART_JOB
if [ -f /etc/default/$UPSTART_JOB ]; then
. /etc/default/$UPSTART_JOB
fi
@ -26,7 +26,7 @@ script
if [ -f /etc/default/$UPSTART_JOB ]; then
. /etc/default/$UPSTART_JOB
fi
exec "$KUBE_PROXY" $KUBE_PROXY_OPTS
exec $KUBE_PROXY proxy $KUBE_PROXY_OPTS
end script
start on runlevel [235]

4
Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/init_conf/kube-scheduler.conf
View File

@ -9,7 +9,7 @@ stop on stopping etcd
pre-start script
# see also https://github.com/jainvipin/kubernetes-start
KUBE_SCHEDULER=/opt/bin/hyperkube scheduler
KUBE_SCHEDULER=/opt/bin/$UPSTART_JOB
if [ -f /etc/default/$UPSTART_JOB ]; then
. /etc/default/$UPSTART_JOB
fi
@ -26,7 +26,7 @@ script
if [ -f /etc/default/$UPSTART_JOB ]; then
. /etc/default/$UPSTART_JOB
fi
exec "$KUBE_SCHEDULER" $KUBE_SCHEDULER_OPTS
exec $KUBE_SCHEDULER scheduler $KUBE_SCHEDULER_OPTS
end script
start on runlevel [235]

4
Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/init_conf/kubelet.conf
View File

@ -9,7 +9,7 @@ stop on stopping etcd
pre-start script
# see also https://github.com/jainvipin/kubernetes-ubuntu-start
KUBELET=/opt/bin/hyperkube kubelet
KUBELET=/opt/bin/$UPSTART_JOB
if [ -f /etc/default/$UPSTART_JOB ]; then
. /etc/default/$UPSTART_JOB
fi
@ -26,7 +26,7 @@ script
if [ -f /etc/default/$UPSTART_JOB ]; then
. /etc/default/$UPSTART_JOB
fi
exec "$KUBELET" $KUBELET_OPTS
exec $KUBELET kubelet $KUBELET_OPTS
end script
start on runlevel [235]

2
Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/initd_scripts/kube-apiserver
View File

@ -19,7 +19,7 @@ export PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin:/opt/bi
BASE=$(basename $0)
# modify these in /etc/default/$BASE (/etc/default/kube-apiserver)
KUBE_APISERVER=/opt/bin/hyperkube apiserver
KUBE_APISERVER="/opt/bin/hyperkube apiserver"
# This is the pid file managed by kube-apiserver itself
KUBE_APISERVER_PIDFILE=/var/run/$BASE.pid
KUBE_APISERVER_LOGFILE=/var/log/$BASE.log

2
Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/initd_scripts/kube-controller-manager
View File

@ -19,7 +19,7 @@ export PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin:/opt/bi
BASE=$(basename $0)
# modify these in /etc/default/$BASE (/etc/default/kube-controller-manager)
KUBE_CONTROLLER_MANAGER=/opt/bin/hyperkube controller-manager
KUBE_CONTROLLER_MANAGER="/opt/bin/hyperkube controller-manager"
# This is the pid file managed by kube-controller-manager itself
KUBE_CONTROLLER_MANAGER_PIDFILE=/var/run/$BASE.pid
KUBE_CONTROLLER_MANAGER_LOGFILE=/var/log/$BASE.log

2
Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/initd_scripts/kube-proxy
View File

@ -19,7 +19,7 @@ export PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin:/opt/bi
BASE=$(basename $0)
# modify these in /etc/default/$BASE (/etc/default/kube-proxy)
KUBE_PROXY=/opt/bin/hyperkube proxy
KUBE_PROXY="/opt/bin/hyperkube proxy"
# This is the pid file managed by kube-proxy itself
KUBE_PROXY_PIDFILE=/var/run/$BASE.pid
KUBE_PROXY_LOGFILE=/var/log/$BASE.log

2
Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/initd_scripts/kube-scheduler
View File

@ -19,7 +19,7 @@ export PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin:/opt/bi
BASE=$(basename $0)
# modify these in /etc/default/$BASE (/etc/default/kube-scheduler)
KUBE_SCHEDULER=/opt/bin/hyperkube scheduler
KUBE_SCHEDULER="/opt/bin/hyperkube scheduler"
# This is the pid file managed by kube-scheduler itself
KUBE_SCHEDULER_PIDFILE=/var/run/$BASE.pid
KUBE_SCHEDULER_LOGFILE=/var/log/$BASE.log

2
Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/initd_scripts/kubelet
View File

@ -19,7 +19,7 @@ export PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin:/opt/bi
BASE=$(basename $0)
# modify these in /etc/default/$BASE (/etc/default/kube-apiserver)
KUBELET=/opt/bin/hyperkube kubelet
KUBELET="/opt/bin/hyperkube kubelet"
# This is the pid file managed by kube-apiserver itself
KUBELET_PIDFILE=/var/run/$BASE.pid
KUBELET_LOGFILE=/var/log/$BASE.log