removed init and upstart since they are no longer supported

avinetworks · Jun 19, 2019 · 376cbd0 · 376cbd0
1 parent 27c3404
commit 376cbd0
Show file tree

Hide file tree

Showing 11 changed files with 1 addition and 302 deletions.
diff --git a/files/init/avicontroller b/files/init/avicontroller
diff --git a/files/init/avicontroller_watcher b/files/init/avicontroller_watcher
diff --git a/files/init/avicontroller_watcher.sh b/files/init/avicontroller_watcher.sh
diff --git a/files/upstart/avicontroller b/files/upstart/avicontroller
diff --git a/files/upstart/avicontroller.conf b/files/upstart/avicontroller.conf
diff --git 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
@@ -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
@@ -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
diff --git a/tasks/docker/services/upstart/install.yml b/tasks/docker/services/upstart/install.yml
diff --git a/templates/16.x/avicontroller.j2 b/templates/16.x/avicontroller.j2