diff options
4 files changed, 34 insertions, 16 deletions
diff --git a/build/make_repo.sh b/build/make_repo.sh index 6d5faab7..9a56cdf9 100755 --- a/build/make_repo.sh +++ b/build/make_repo.sh @@ -176,7 +176,7 @@ function make_all_repo() make_repo --os-ver rhel7 --package-tag juno \ --ansible-dir $WORK_PATH/deploy/adapters/ansible \ - --default-package "rsyslog strace net-tools wget vim openssh-server dracut-config-rescue dracut-network" + --default-package "rsyslog-7.6.7-1.el7 strace net-tools wget vim openssh-server dracut-config-rescue-033-241.el7_1.3 dracut-network-033-241.el7_1.3" } function main() diff --git a/deploy/adapters/ansible/roles/odl_cluster/templates/opendaylight b/deploy/adapters/ansible/roles/odl_cluster/templates/opendaylight new file mode 100755 index 00000000..90a267d6 --- /dev/null +++ b/deploy/adapters/ansible/roles/odl_cluster/templates/opendaylight @@ -0,0 +1,31 @@ +#!/bin/bash +# chkconfig: 345 98 2 +# description: ODL controller +# OpenDaylight service controller script +export JAVA_HOME=/usr/lib/jvm/java-8-oracle +USER=odl + +cd /opt/opendaylight-0.3.0 +case "$1" in + start) + /bin/su -m $USER -s /bin/bash -c ./bin/start + ;; + stop) + /bin/su -m $USER -s /bin/bash -c ./bin/stop + ;; + status) + PID=`ps aux | grep java | grep karaf | awk '{print $2}'` + if test -z $PID + then + echo "ODL is down..." + exit 1 + else + echo "ODL is running... PID $PID" + exit 0 + fi + ;; + *) + echo "Usage: $0 {start|stop|status}" + exit 1 + ;; +esac diff --git a/deploy/adapters/ansible/roles/odl_cluster/templates/opendaylight.service b/deploy/adapters/ansible/roles/odl_cluster/templates/opendaylight.service deleted file mode 100755 index a4adeeec..00000000 --- a/deploy/adapters/ansible/roles/odl_cluster/templates/opendaylight.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=OpenDaylight SDN Controller -Documentation=https://wiki.opendaylight.org/view/Main_Page http://www.opendaylight.org/ -After=network.service - -[Service] -Type=forking -ExecStart=/opt/opendaylight-0.3.0/bin/start -User=odl -Group=odl - -[Install] -WantedBy=multi-user.target diff --git a/deploy/adapters/ansible/roles/odl_cluster/vars/RedHat.yml b/deploy/adapters/ansible/roles/odl_cluster/vars/RedHat.yml index c0dfede1..c125f89e 100755 --- a/deploy/adapters/ansible/roles/odl_cluster/vars/RedHat.yml +++ b/deploy/adapters/ansible/roles/odl_cluster/vars/RedHat.yml @@ -9,5 +9,5 @@ compute_packages: service_file: - src: opendaylight.service - dst: /usr/lib/systemd/system/opendaylight.service + src: opendaylight + dst: /etc/init.d/opendaylight |