From a5d1c711ce95e876d3620a021316412767fcfc61 Mon Sep 17 00:00:00 2001
From: David Galloway <dgallowa@redhat.com>
Date: Tue, 26 Apr 2016 16:49:28 -0400
Subject: [PATCH] testnode: Remove manual configuration of getty

Manual configuration of the getty service is no longer required for
Trusty or later.  The system-specific "console=ttySX" parameter in
/proc/cmdline is enough to configure the SOL tty during Ubuntu
installation.

See http://tracker.ceph.com/issues/15269 for further explanation.

Signed-off-by: David Galloway <dgallowa@redhat.com>
---
 roles/testnode/handlers/main.yml              | 10 --------
 .../tasks/setup-ubuntu-non-aarch64.yml        | 23 -------------------
 roles/testnode/templates/ttyS1.conf           | 11 ---------
 roles/testnode/templates/ttyS2.conf           | 11 ---------
 4 files changed, 55 deletions(-)
 delete mode 100644 roles/testnode/templates/ttyS1.conf
 delete mode 100644 roles/testnode/templates/ttyS2.conf

diff --git a/roles/testnode/handlers/main.yml b/roles/testnode/handlers/main.yml
index add74920..a87e9106 100644
--- a/roles/testnode/handlers/main.yml
+++ b/roles/testnode/handlers/main.yml
@@ -26,16 +26,6 @@
     name: cron
     state: restarted
 
-- name: start ttyS1
-  service:
-    name: ttyS1
-    state: started
-
-- name: start ttyS2
-  service:
-    name: ttyS2
-    state: started
-
 - name: restart nagios-nrpe-server
   service:
     name: "{{ nrpe_service_name }}"
diff --git a/roles/testnode/tasks/setup-ubuntu-non-aarch64.yml b/roles/testnode/tasks/setup-ubuntu-non-aarch64.yml
index b4d1d9fe..836669d5 100644
--- a/roles/testnode/tasks/setup-ubuntu-non-aarch64.yml
+++ b/roles/testnode/tasks/setup-ubuntu-non-aarch64.yml
@@ -29,29 +29,6 @@
   tags:
     - kernel_logging
 
-- name: Upload ttyS1.conf.
-  template:
-    src: ttyS1.conf
-    dest: /etc/init/ttyS1.conf
-    owner: root
-    group: root
-    mode: 0644
-  notify:
-    - start ttyS1
-  when: not ansible_hostname | search("^target")
-
-# this only runs on mira nodes
-- name: Upload ttyS2.conf.
-  template:
-    src: ttyS2.conf
-    dest: /etc/init/ttyS2.conf
-    owner: root
-    group: root
-    mode: 0644
-  notify:
-    - start ttyS2
-  when: ansible_hostname | search("^mira*")
-
 - name: Enable kernel modules to load at boot time.
   template:
     src: modules
diff --git a/roles/testnode/templates/ttyS1.conf b/roles/testnode/templates/ttyS1.conf
deleted file mode 100644
index b7bd47d0..00000000
--- a/roles/testnode/templates/ttyS1.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-# {{ ansible_managed }}
-# ttyS1 - getty
-#
-# This service maintains a getty on ttyS1 from the point the system is
-# started until it is shut down again.
-
-start on stopped rc RUNLEVEL=[2345]
-stop on runlevel [!2345]
-
-respawn
-exec /sbin/getty -8 115200 ttyS1
diff --git a/roles/testnode/templates/ttyS2.conf b/roles/testnode/templates/ttyS2.conf
deleted file mode 100644
index 105040f0..00000000
--- a/roles/testnode/templates/ttyS2.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-# {{ ansible_managed }}
-# ttyS2 - getty
-#
-# This service maintains a getty on ttyS2 from the point the system is
-# started until it is shut down again.
-
-start on stopped rc RUNLEVEL=[2345]
-stop on runlevel [!2345]
-
-respawn
-exec /sbin/getty -8 115200 ttyS2
-- 
2.47.3