From 3681ab5fb2a39ccb06024e6ad514ad50df21f9d2 Mon Sep 17 00:00:00 2001
From: Joel Diaz <jdiaz@redhat.com>
Date: Fri, 8 Apr 2016 13:48:13 -0400
Subject: cleanup roles after roles move to openshift-tools

also removing inventory/multi_inventory*

things left behind unchanged even though they were copied:
playbooks/adhoc/*
roles/dns
roles/kube_nfs_volumes
roles/os_update_latest
---
 .../templates/docker-registry.ops.cfg.j2           |  1 -
 .../templates/oso-rhel7-host-monitoring.service.j2 | 78 ----------------------
 2 files changed, 79 deletions(-)
 delete mode 100644 roles/oso_host_monitoring/templates/docker-registry.ops.cfg.j2
 delete mode 100644 roles/oso_host_monitoring/templates/oso-rhel7-host-monitoring.service.j2

(limited to 'roles/oso_host_monitoring/templates')

diff --git a/roles/oso_host_monitoring/templates/docker-registry.ops.cfg.j2 b/roles/oso_host_monitoring/templates/docker-registry.ops.cfg.j2
deleted file mode 100644
index 9e49da469..000000000
--- a/roles/oso_host_monitoring/templates/docker-registry.ops.cfg.j2
+++ /dev/null
@@ -1 +0,0 @@
-{"{{ osohm_docker_registry_ops_url }}":{"auth":"{{ osohm_docker_registry_ops_key }}","email":"{{ osohm_docker_registry_ops_email }}"}}
diff --git a/roles/oso_host_monitoring/templates/oso-rhel7-host-monitoring.service.j2 b/roles/oso_host_monitoring/templates/oso-rhel7-host-monitoring.service.j2
deleted file mode 100644
index e17092202..000000000
--- a/roles/oso_host_monitoring/templates/oso-rhel7-host-monitoring.service.j2
+++ /dev/null
@@ -1,78 +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 oso-rhel7-host-monitoring
-#  systemctl start oso-rhel7-host-monitoring
-#
-#
-[Unit]
-Description=Openshift Host Monitoring Container
-Requires=docker.service
-After=docker.service
-
-
-[Service]
-Type=simple
-TimeoutStartSec=5m
-Environment=HOME=/etc/docker/ops
-#Slice=container-small.slice
-
-# systemd syntax '=-' ignore errors from return codes.
-ExecStartPre=-/usr/bin/docker kill "{{ osohm_host_monitoring }}"
-ExecStartPre=-/usr/bin/docker rm "{{ osohm_host_monitoring }}"
-ExecStartPre=-/usr/bin/docker pull "{{ osohm_docker_registry_url }}{{ osohm_host_monitoring }}"
-
-# mwoodson note 1-7-16:
-# pcp recommends mounting /run in their Dockerfile
-#  /run conflicts with cron which also runs in this container.
-# I am leaving /run out for now.  the guys in #pcp said that they mounted /run
-#  to shared the pcp socket that is created in /run. We are not using this,
-#  as far as I know.
-#  This problem goes away with systemd being run in the containers and not using
-#   cron but using systemd timers
-#           -v /run:/run                                     \
-
-ExecStart=/usr/bin/docker run --name {{ osohm_host_monitoring }}                             \
-           --privileged                                                                      \
-           --pid=host                                                                        \
-           --net=host                                                                        \
-           --ipc=host                                                                        \
-           -e ZAGG_URL={{ osohm_zagg_web_url }}                                              \
-           -e ZAGG_USER={{ osohm_default_zagg_server_user }}                                 \
-           -e ZAGG_PASSWORD={{ osohm_default_zagg_server_password }}                         \
-           -e ZAGG_CLIENT_HOSTNAME={{ oo_name }}                                        \
-           -e ZAGG_SSL_VERIFY={{ osohm_zagg_verify_ssl }}                                    \
-           -e OSO_CLUSTER_GROUP={{ cluster_group }}                                          \
-           -e OSO_CLUSTER_ID={{ oo_clusterid }}                                              \
-           -e OSO_ENVIRONMENT={{ oo_environment }}                                           \
-           -e OSO_HOST_TYPE={{ hostvars[inventory_hostname]['oo_hosttype'] }}          \
-           -e OSO_SUB_HOST_TYPE={{ hostvars[inventory_hostname]['oo_subhosttype'] }}  \
-           -e OSO_MASTER_HA={{ osohm_master_ha }}                                            \
-           -v /etc/localtime:/etc/localtime                                                  \
-           -v /sys:/sys:ro                                                                   \
-           -v /sys/fs/selinux                                                                \
-           -v /var/lib/docker:/var/lib/docker:ro                                             \
-           -v /var/run/docker.sock:/var/run/docker.sock                                      \
-           -v /var/run/openvswitch:/var/run/openvswitch                                      \
-{% if hostvars[inventory_hostname]['oo_hosttype'] == 'master' %}
-           -v /etc/origin/master/admin.kubeconfig:/etc/origin/master/admin.kubeconfig  \
-           -v /etc/origin/master/master.etcd-client.crt:/etc/origin/master/master.etcd-client.crt \
-           -v /etc/origin/master/master.etcd-client.key:/etc/origin/master/master.etcd-client.key \
-           -v /etc/origin/master/master-config.yaml:/etc/origin/master/master-config.yaml \
-{% elif hostvars[inventory_hostname]['oo_hosttype'] == 'node' %}
-           -v /etc/origin/node:/etc/origin/node                                              \
-{% endif %}
-           {{ osohm_docker_registry_url }}{{ osohm_host_monitoring }}
-
-
-ExecReload=-/usr/bin/docker stop "{{ osohm_host_monitoring }}"
-ExecReload=-/usr/bin/docker rm "{{ osohm_host_monitoring }}"
-ExecStop=-/usr/bin/docker stop "{{ osohm_host_monitoring }}"
-Restart=always
-RestartSec=30
-
-[Install]
-WantedBy=default.target
-- 
cgit v1.2.3