From 376cbd0c80c80fc6b825c4921beec3055a705257 Mon Sep 17 00:00:00 2001 From: Eric Anderson Date: Wed, 19 Jun 2019 16:35:01 -0700 Subject: [PATCH] removed init and upstart since they are no longer supported --- files/init/avicontroller | 34 ------- files/init/avicontroller_watcher | 57 ----------- files/init/avicontroller_watcher.sh | 11 -- files/upstart/avicontroller | 32 ------ files/upstart/avicontroller.conf | 21 ---- handlers/main.yml | 3 - tasks/docker/fresh_install.yml | 12 --- tasks/docker/main.yml | 6 +- tasks/docker/services/upstart/check.yml | 5 - tasks/docker/services/upstart/install.yml | 5 - templates/16.x/avicontroller.j2 | 117 ---------------------- 11 files changed, 1 insertion(+), 302 deletions(-) delete mode 100644 files/init/avicontroller delete mode 100644 files/init/avicontroller_watcher delete mode 100644 files/init/avicontroller_watcher.sh delete mode 100644 files/upstart/avicontroller delete mode 100644 files/upstart/avicontroller.conf delete mode 100644 tasks/docker/services/upstart/check.yml delete mode 100644 tasks/docker/services/upstart/install.yml delete mode 100644 templates/16.x/avicontroller.j2 diff --git a/files/init/avicontroller b/files/init/avicontroller deleted file mode 100644 index 0d39c5a..0000000 --- a/files/init/avicontroller +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh -# -# /etc/init.d/avicontroller -# -# Daemon for avicontroller -# -# chkconfig: 2345 99 99 -# description: Service for the Avi Controller - -### BEGIN INIT INFO -# Provides: avicontroller -# Required-Start: docker -# Required-Stop: -# Should-Start: -# Should-Stop: -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: start and stop avicontroller -# Description: Service for the Avi Controller -### END INIT INFO - -case "$1" in - start|restart|reload) - /usr/sbin/avicontroller $1 & - ;; - stop|status) - /usr/sbin/avicontroller $1 - ;; - *) - echo $"Usage: $0 {start|stop|status|restart|reload}" - exit 2 -esac - -exit $? diff --git a/files/init/avicontroller_watcher b/files/init/avicontroller_watcher deleted file mode 100644 index ec8a2c4..0000000 --- a/files/init/avicontroller_watcher +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/sh -# -# /etc/init.d/avicontroller_watcher -# -# Daemon for avicontroller_watcher -# -# chkconfig: 2345 99 99 -# description: AVI Controller WATCHER - -### BEGIN INIT INFO -# Provides: avicontroller_watcher -# Required-Start: docker -# Required-Stop: -# Should-Start: -# Should-Stop: -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: start and stop avicontroller_watcher -# Description: AVI Controller Watcher -### END INIT INFO - -start() { - echo "Starting avicontroller watcher" - nohup /etc/init.d/avicontroller_watcher.sh 0<&- &>/dev/null & -} - -stop() { - echo "Stopping avicontroller watcher" - ps -ef | grep avicontroller_watcher.sh | grep -v grep | awk '{print $2}' | xargs --no-run-if-empty kill -9 - service avicontroller stop -} - -restart() { - stop - start -} - -case "$1" in - start) - $1 - ;; - stop) - $1 - ;; - restart) - $1 - ;; - status) - docker ps -f name=avicontroller - ;; - *) - echo $"Usage: $0 {start|stop|status|restart}" - exit 2 - ;; -esac - -exit $? diff --git a/files/init/avicontroller_watcher.sh b/files/init/avicontroller_watcher.sh deleted file mode 100644 index 610b19d..0000000 --- a/files/init/avicontroller_watcher.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash - -while true -do - service avicontroller start - sleep 1 - docker wait avicontroller - sleep 1 - docker rm -f avicontroller - sleep 1 -done diff --git a/files/upstart/avicontroller b/files/upstart/avicontroller deleted file mode 100644 index 7a73a96..0000000 --- a/files/upstart/avicontroller +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh -# -# /etc/init.d/avicontroller -# -# Daemon for avicontroller -# -# chkconfig: 2345 99 99 -# description: Service for the Avi Controller - -### BEGIN INIT INFO -# Provides: avicontroller -# Required-Start: docker -# Required-Stop: -# Should-Start: -# Should-Stop: -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: start and stop avicontroller -# Description: Service for the Avi Controller -### END INIT INFO - -case "$1" in - start|stop|status|restart|reload) - echo "We are now using upstart, please see /etc/init/avicontroller.conf for more information." - initctl $1 avicontroller - ;; - *) - echo $"Usage: $0 {start|stop|status|restart|reload}" - exit 2 -esac - -exit $? diff --git a/files/upstart/avicontroller.conf b/files/upstart/avicontroller.conf deleted file mode 100644 index 1f31b97..0000000 --- a/files/upstart/avicontroller.conf +++ /dev/null @@ -1,21 +0,0 @@ -# Avi Controller upstart file at /etc/init/avicontroller.conf - -description "Avi Controller Service" -author "Avi Networks " - -# When to start the service -start on filesystem and started docker and runlevel [2345] - -# When to stop the service -stop on runlevel [016] - -# Automatically restart the process if crashed -respawn - -script - /usr/sbin/avicontroller start -end script - -post-stop script - /usr/sbin/avicontroller stop -end script diff --git a/handlers/main.yml b/handlers/main.yml index c9ff326..29c5e9a 100644 --- a/handlers/main.yml +++ b/handlers/main.yml @@ -6,6 +6,3 @@ - name: Avi Controller | Services | Restart the avicontroller service service: name=avicontroller enabled=yes state=restarted - -- name: Avi Controller | Services | init.d | Restart the avicontroller_watcher service - service: name=avicontroller_watcher enabled=yes state=restarted diff --git a/tasks/docker/fresh_install.yml b/tasks/docker/fresh_install.yml index e3b35e5..1f94c7c 100644 --- a/tasks/docker/fresh_install.yml +++ b/tasks/docker/fresh_install.yml @@ -1,12 +1,4 @@ --- -- block: - - name: Avi Controller | Requirements | init.d | Stop the avicontroller_watcher service for fresh install - service: name=avicontroller_watcher enabled=no state=stopped - - name: Avi Controller | Requirements | init.d | Stop the avicontroller service for fresh install - service: name=avicontroller enabled=no state=stopped - when: ansible_service_mgr == 'init' or - ( ansible_service_mgr != 'systemd' and not con_new_service ) - - name: Avi Controller | Requirements | systemd | Check the avicontroller service exist stat: path=/etc/systemd/system/avicontroller.service register: service_status @@ -15,10 +7,6 @@ systemd: daemon_reload=yes name=avicontroller enabled=no state=stopped when: ansible_service_mgr == 'systemd' and service_status.stat.exists -- name: Avi Controller | Requirements | upstart | Stop the avicontroller service for fresh install - service: name=avicontroller enabled=no state=stopped - when: ansible_service_mgr == 'upstart' and con_new_service - - name: Avi Controller | Requirements | Clean directories for fresh install file: path="{{ item }}" state=absent when: item != None diff --git a/tasks/docker/main.yml b/tasks/docker/main.yml index b9056a3..90b8726 100644 --- a/tasks/docker/main.yml +++ b/tasks/docker/main.yml @@ -1,11 +1,7 @@ --- - - name: Avi Controller | Services | systemd | Check if Avi Controller installed include: "services/systemd/check.yml" when: ansible_service_mgr == "systemd" -- name: Avi Controller | Services | init.d | Check if Avi Controller installed - include: "services/initd/check.yml" - when: ansible_service_mgr != "systemd" - block: - name: Avi Controller | Check minimum requirements @@ -28,7 +24,7 @@ when: con_setup_json != None - name: Avi Controller | Copy setup.json to controller - copy: content="{{ con_setup_json_raw | to_nice_json }}\n" dest="{{ con_disk_path }}/setup.json" + copy: content="{{ con_setup_json_raw | to_json }}\n" dest="{{ con_disk_path }}/setup.json" when: con_setup_json_raw != None # We must do this step first just in case we need to override defaults from the supplied package diff --git a/tasks/docker/services/upstart/check.yml b/tasks/docker/services/upstart/check.yml deleted file mode 100644 index 8c03f47..0000000 --- a/tasks/docker/services/upstart/check.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -- name: Avi Controller | Check if Avi Controller installed - stat: - path: /etc/init/avicontroller.conf - register: avi_installed diff --git a/tasks/docker/services/upstart/install.yml b/tasks/docker/services/upstart/install.yml deleted file mode 100644 index ee03270..0000000 --- a/tasks/docker/services/upstart/install.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -- name: Avi Controller | Services | upstart | Deploy the avicontroller service - copy: src=upstart/avicontroller.conf dest=/etc/init/avicontroller.conf mode=0644 - register: avicontroller_service - notify: Avi Controller | Services | Restart the avicontroller service diff --git a/templates/16.x/avicontroller.j2 b/templates/16.x/avicontroller.j2 deleted file mode 100644 index 97db55b..0000000 --- a/templates/16.x/avicontroller.j2 +++ /dev/null @@ -1,117 +0,0 @@ -#!/bin/sh -# -# /etc/rc.d/init.d/avicontroller -# -# Daemon for avicontroller -# -# chkconfig: 2345 99 99 -# description: Avi Controller service - -### BEGIN INIT INFO -# Provides: avicontroller -# Required-Start: docker -# Required-Stop: -# Should-Start: -# Should-Stop: -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: start and stop avicontroller -# Description: Avi Controller service -### END INIT INFO - -write_log() { - echo $1 2>&1 | tee -a /var/log/avicontroller.log -} - -remove_container() { - write_log "[`date`] Removing existing avicontroller container" - /usr/bin/docker rm -f avicontroller - if [ $? -eq 0 ]; then - write_log "[`date`] Removed existing avicontroller container" - else - write_log "[`date`] Failed to remove existing avicontroller container" - fi -} - -prestart() { - # Clean up any running or existing avicontroller containers - write_log "[`date`] Performing avicontroller pre-start steps" - if $(docker ps -a -f name=avicontroller | grep -q avicontroller); then - write_log "[`date`] Already running avicontroller container performing cleanup" - remove_container - fi -} - -start() { - prestart - write_log "[`date`] Starting the avicontroller container" - /usr/bin/docker run {{ con_docker_run_params }} - if [ $? -eq 0 ]; then - write_log "[`date`] Service avicontroller running..." - /usr/bin/docker wait avicontroller - else - write_log "[`date`] Failed to start the avicontroller container" - exit 1 - fi -} - -stop() { - # Stopping the docker process if running - if $(docker ps -f name=avicontroller | grep -q avicontroller); then - write_log "[`date`] Service avicontroller stopping..." - /usr/bin/docker stop -t 60 avicontroller - if [ $? -eq 0 ]; then - write_log "[`date`] Stopped the avicontroller container" - else - exit 1 - fi - else - write_log "[`date`] Service avicontroller already stopped" - fi - poststop -} - -poststop() { - if $(ip addr | grep -q {{ con_dev_name }}:avivip); then - /bin/bash -c "ip addr del $(ip addr | grep {{ con_dev_name }}:avivip | awk '{print $2}') dev {{ con_dev_name }}" - if [ $? -eq 0 ]; then - write_log "[`date`] Successfuly removed the cluster vip interface." - fi - elif $(ip addr | grep -q {{ con_dev_name }}:1); then - /bin/bash -c "ip addr del $(ip addr | grep {{ con_dev_name }}:1 | awk '{print $2}') dev {{ con_dev_name }}" - if [ $? -eq 0 ]; then - write_log "[`date`] Successfuly removed the cluster vip interface." - fi - fi - if $(docker ps -a -f name=avicontroller | grep -q avicontroller); then - remove_container - fi -} - -restart() { - stop - start -} - -reload() { - restart -} - -status() { - if $(docker ps -f name=avicontroller | grep -q avicontroller); then - echo "avicontroller running..." - else - echo "avicontroller stopped" - fi -} - -case "$1" in - start|stop|status|restart|reload) - $1 - ;; - *) - echo $"Usage: $0 {start|stop|status|restart|reload}" - exit 2 -esac - -exit $?