Merge pull request #445 from mwoodson/remove_monitor

removed deploy monitoring containders

3 files changed, 0 insertions, 133 deletions

diff --git a/playbooks/adhoc/deploy_monitoring_containers/deploy.yml b/playbooks/adhoc/deploy_monitoring_containers/deploy.yml
deleted file mode 100644
index 44df693d5..000000000
--- a/playbooks/adhoc/deploy_monitoring_containers/deploy.yml
+++ /dev/null
@@ -1,58 +0,0 @@
----
-- name: Setup hosts
-  hosts: localhost
-  gather_facts: no
-  user: root
-  tasks:
-  - name: build inven
-    add_host: "name={{ hostvars[item]['ec2_public_dns_name'] }} groups=oo_hosts"
-    with_items: groups['tag_env-host-type_kwoodsontest2-openshift-node']
-
-  - debug: msg=oo_hosts
-
-- name: Deploy host-monitoring
-  hosts: oo_hosts
-  user: root
-  tasks:
-  - name: Deploy docker oso-f22-host-monitoring
-    command: docker pull docker-registry.ops.rhcloud.com/ops/oso-f22-host-monitoring
-
-  - name: Deploy oso-rhel7-zagg-client
-    command: docker pull docker-registry.ops.rhcloud.com/ops/oso-rhel7-zagg-client
-
-  - name: Copy oso-f22-host-monitoring systemd file
-    copy:
-        src: oso-f22-host-monitoring.service
-        dest: /etc/systemd/system/oso-f22-host-monitoring.service
-        owner: root
-        group: root
-        mode: 0644
-    register: pcp_systemd
-
-  - name: Copy zagg-client systemd file
-    copy:
-        src: oso-rhel7-zagg-client.service
-        dest: /etc/systemd/system/oso-rhel7-zagg-client.service
-        owner: root
-        group: root
-        mode: 0644
-    register: zagg_systemd
-
-  - name: reload systemd
-    command: /usr/bin/systemctl --system daemon-reload
-    when: pcp_systemd.changed or zagg_systemd.changed
-
-  - name: pasue for a few seconds
-    pause: seconds=5
-
-  - name: Start the oso-f22-host-monitoring service
-    service:
-      name: oso-f22-host-monitoring
-      state: started
-      enabled: yes
-
-  - name: Start the oso-rhel7-zagg-client service
-    service:
-      name: oso-rhel7-zagg-client
-      state: started
-      enabled: yes
diff --git a/playbooks/adhoc/deploy_monitoring_containers/oso-f22-host-monitoring.service b/playbooks/adhoc/deploy_monitoring_containers/oso-f22-host-monitoring.service
deleted file mode 100644
index 852be09b6..000000000
--- a/playbooks/adhoc/deploy_monitoring_containers/oso-f22-host-monitoring.service
+++ /dev/null
@@ -1,36 +0,0 @@
-# This is a systemd file to run this docker container under systemd.
-# To make this work:
-#  * pull the image (probably from ops docker registry)
-#  * place this file in /etc/systemd/system without the .systemd extension
-#  * run the commands:
-#  systemctl daemon-reload
-#  systemctl enable pcp-docker
-#  systemctl start pcp-docker
-#
-#
-[Unit]
-Description=PCP Collector Contatainer
-Requires=docker.service
-After=docker.service
-
-
-[Service]
-Type=simple
-TimeoutStartSec=5m
-#Slice=container-small.slice
-
-ExecStartPre=-/usr/bin/docker rm "oso-f22-host-monitoring"
-
-ExecStart=/usr/bin/docker run --rm  --name=oso-f22-host-monitoring            \
-          --privileged --net=host --pid=host --ipc=host                       \
-          -v /sys:/sys:ro  -v /etc/localtime:/etc/localtime:ro                \
-          -v /var/lib/docker:/var/lib/docker:ro -v /run:/run                  \
-          -v /var/log:/var/log                                                \
-          docker-registry.ops.rhcloud.com/ops/oso-f22-host-monitoring
-
-ExecReload=-/usr/bin/docker stop "oso-f22-host-monitoring"
-ExecReload=-/usr/bin/docker rm "oso-f22-host-monitoring"
-ExecStop=-/usr/bin/docker stop "oso-f22-host-monitoring"
-
-[Install]
-WantedBy=default.target
diff --git a/playbooks/adhoc/deploy_monitoring_containers/oso-rhel7-zagg-client.service b/playbooks/adhoc/deploy_monitoring_containers/oso-rhel7-zagg-client.service
deleted file mode 100644
index 381c7b487..000000000
--- a/playbooks/adhoc/deploy_monitoring_containers/oso-rhel7-zagg-client.service
+++ /dev/null
@@ -1,39 +0,0 @@
-# This is a systemd file to run this docker container under systemd.
-# To make this work:
-#  * pull the image (probably from ops docker registry)
-#  * place this file in /etc/systemd/system without the .systemd extension
-#  * run the commands:
-#  systemctl daemon-reload
-#  systemctl enable zagg-client-docker
-#  systemctl start zagg-client-docker
-#
-#
-[Unit]
-Description=Zagg Client Contatainer
-Requires=docker.service
-After=docker.service
-
-
-[Service]
-Type=simple
-TimeoutStartSec=5m
-#Slice=container-small.slice
-
-ExecStartPre=-/usr/bin/docker rm "oso-rhel7-zagg-client"
-
-
-ExecStart=/usr/bin/docker run --name oso-rhel7-zagg-client                               \
-           -e ZAGG_SERVER=SERVERNAME                                                     \
-           -e ZAGG_USER=USERNAME                                                         \
-           -e ZAGG_PASSWORD=PASSWORD                                                     \
-           -v /etc/localtime:/etc/localtime                                              \
-           -v /run/pcp:/run/pcp                                                          \
-           docker-registry.ops.rhcloud.com/ops/oso-rhel7-zagg-client
-
-
-ExecReload=-/usr/bin/docker stop "oso-rhel7-zagg-client"
-ExecReload=-/usr/bin/docker rm "oso-rhel7-zagg-client"
-ExecStop=-/usr/bin/docker stop "oso-rhel7-zagg-client"
-
-[Install]
-WantedBy=default.target