From 023f92f9e3eec7de6c1286549000be79189a4fde Mon Sep 17 00:00:00 2001 From: Thomas Wiest Date: Mon, 15 Dec 2014 16:00:47 -0500 Subject: changed atomic proxy to use pre-built container images --- .../templates/systemd/ctr-proxy-1.service.j2 | 32 +++++++++++++++++++ .../systemd/ctr-proxy-monitoring-1.service.j2 | 36 ++++++++++++++++++++++ .../systemd/ctr-proxy-puppet-1.service.j2 | 33 ++++++++++++++++++++ 3 files changed, 101 insertions(+) create mode 100644 roles/atomic_proxy/templates/systemd/ctr-proxy-1.service.j2 create mode 100644 roles/atomic_proxy/templates/systemd/ctr-proxy-monitoring-1.service.j2 create mode 100644 roles/atomic_proxy/templates/systemd/ctr-proxy-puppet-1.service.j2 (limited to 'roles/atomic_proxy/templates') diff --git a/roles/atomic_proxy/templates/systemd/ctr-proxy-1.service.j2 b/roles/atomic_proxy/templates/systemd/ctr-proxy-1.service.j2 new file mode 100644 index 000000000..988a9f544 --- /dev/null +++ b/roles/atomic_proxy/templates/systemd/ctr-proxy-1.service.j2 @@ -0,0 +1,32 @@ +[Unit] +Description=Container proxy-1 + + +[Service] +Type=simple +TimeoutStartSec=5m +Slice=container-small.slice + +ExecStartPre=-/usr/bin/docker rm "proxy-1" + +ExecStart=/usr/bin/docker run --rm --name "proxy-1" \ + --volumes-from proxy-shared-data-1 \ + -a stdout -a stderr -p 80:80 -p 443:443 -p 4999:4999 \ + "docker-registry.ops.rhcloud.com/oso-v2-proxy:{{ oo_env }}" + +ExecReload=-/usr/bin/docker stop "proxy-1" +ExecReload=-/usr/bin/docker rm "proxy-1" +ExecStop=-/usr/bin/docker stop "proxy-1" + +[Install] +WantedBy=container.target + +# Container information +X-ContainerId=proxy-1 +X-ContainerImage=docker-registry.ops.rhcloud.com/oso-v2-proxy:{{ oo_env }} +X-ContainerUserId= +X-ContainerRequestId=LwiWtYWaAvSavH6Ze53QJg +X-ContainerType=simple +X-PortMapping=80:80 +X-PortMapping=443:443 +X-PortMapping=4999:4999 diff --git a/roles/atomic_proxy/templates/systemd/ctr-proxy-monitoring-1.service.j2 b/roles/atomic_proxy/templates/systemd/ctr-proxy-monitoring-1.service.j2 new file mode 100644 index 000000000..975b0061b --- /dev/null +++ b/roles/atomic_proxy/templates/systemd/ctr-proxy-monitoring-1.service.j2 @@ -0,0 +1,36 @@ +[Unit] +Description=Container proxy-monitoring-1 + + +[Service] +Type=simple +TimeoutStartSec=5m +Slice=container-small.slice + +ExecStartPre=-/usr/bin/docker rm "proxy-monitoring-1" + +ExecStart=/usr/bin/docker run --rm --name "proxy-monitoring-1" \ + --volumes-from proxy-shared-data-1 \ + -a stdout -a stderr \ + -e "OO_ENV={{ oo_env }}" \ + -e "OO_CTR_TYPE=proxy" \ + -e "OO_ZABBIX_HOSTGROUPS={{ oo_zabbix_hostgroups | join(',') }}" \ + -e "OO_ZABBIX_TEMPLATES=Template OpenShift Proxy Ctr" \ + "docker-registry.ops.rhcloud.com/oso-v2-monitoring:{{ oo_env }}" + +ExecReload=-/usr/bin/docker stop "proxy-monitoring-1" +ExecReload=-/usr/bin/docker rm "proxy-monitoring-1" +ExecStop=-/usr/bin/docker stop "proxy-monitoring-1" + +[Install] +WantedBy=container.target + +# Container information +X-ContainerId=proxy-monitoring-1 +X-ContainerImage=docker-registry.ops.rhcloud.com/oso-v2-monitoring:{{ oo_env }} +X-ContainerUserId= +X-ContainerRequestId=LwiWtYWaAvSavH6Ze53QJg +X-ContainerType=simple +X-PortMapping=80:80 +X-PortMapping=443:443 +X-PortMapping=4999:4999 diff --git a/roles/atomic_proxy/templates/systemd/ctr-proxy-puppet-1.service.j2 b/roles/atomic_proxy/templates/systemd/ctr-proxy-puppet-1.service.j2 new file mode 100644 index 000000000..c3f28f471 --- /dev/null +++ b/roles/atomic_proxy/templates/systemd/ctr-proxy-puppet-1.service.j2 @@ -0,0 +1,33 @@ +[Unit] +Description=Container proxy-puppet-1 + + +[Service] +Type=simple +TimeoutStartSec=5m +Slice=container-small.slice + + +ExecStartPre=-/usr/bin/docker rm "proxy-puppet-1" + +ExecStart=/usr/bin/docker run --rm --name "proxy-puppet-1" \ + --volumes-from proxy-shared-data-1 \ + -v /var/lib/docker/volumes/proxy_puppet/var/lib/puppet/ssl:/var/lib/puppet/ssl \ + -v /var/lib/docker/volumes/proxy_puppet/etc/puppet:/etc/puppet \ + -a stdout -a stderr \ + "docker-registry.ops.rhcloud.com/oso-v2-puppet:{{ oo_env }}" + +# Set links (requires container have a name) +ExecReload=-/usr/bin/docker stop "proxy-puppet-1" +ExecReload=-/usr/bin/docker rm "proxy-puppet-1" +ExecStop=-/usr/bin/docker stop "proxy-puppet-1" + +[Install] +WantedBy=container.target + +# Container information +X-ContainerId=proxy-puppet-1 +X-ContainerImage=docker-registry.ops.rhcloud.com/oso-v2-puppet:{{ oo_env }} +X-ContainerUserId= +X-ContainerRequestId=Ky0lhw0onwoSDJR4GK6t3g +X-ContainerType=simple -- cgit v1.2.3