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 --- roles/atomic_proxy/files/ctr-proxy-1.service | 37 ---------------------- .../files/ctr-proxy-monitoring-1.service | 37 ---------------------- .../atomic_proxy/files/ctr-proxy-puppet-1.service | 37 ---------------------- 3 files changed, 111 deletions(-) delete mode 100644 roles/atomic_proxy/files/ctr-proxy-1.service delete mode 100644 roles/atomic_proxy/files/ctr-proxy-monitoring-1.service delete mode 100644 roles/atomic_proxy/files/ctr-proxy-puppet-1.service (limited to 'roles/atomic_proxy/files') diff --git a/roles/atomic_proxy/files/ctr-proxy-1.service b/roles/atomic_proxy/files/ctr-proxy-1.service deleted file mode 100644 index c532eb8e8..000000000 --- a/roles/atomic_proxy/files/ctr-proxy-1.service +++ /dev/null @@ -1,37 +0,0 @@ - - -[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 \ - "proxy:latest" - -ExecStartPost=-/usr/bin/gear init --post "proxy-1" "proxy:latest" -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=proxy:latest -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/files/ctr-proxy-monitoring-1.service b/roles/atomic_proxy/files/ctr-proxy-monitoring-1.service deleted file mode 100644 index 7a91ea02c..000000000 --- a/roles/atomic_proxy/files/ctr-proxy-monitoring-1.service +++ /dev/null @@ -1,37 +0,0 @@ - - -[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 \ - "monitoring:latest" - -ExecStartPost=-/usr/bin/gear init --post "proxy-monitoring-1" "monitoring:latest" -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=monitoring:latest -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/files/ctr-proxy-puppet-1.service b/roles/atomic_proxy/files/ctr-proxy-puppet-1.service deleted file mode 100644 index c1f4d9b13..000000000 --- a/roles/atomic_proxy/files/ctr-proxy-puppet-1.service +++ /dev/null @@ -1,37 +0,0 @@ - - -[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 \ - "puppet:latest" -# Set links (requires container have a name) -ExecStartPost=-/usr/bin/gear init --post "proxy-puppet-1" "puppet:latest" -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=puppet:latest -X-ContainerUserId= -X-ContainerRequestId=Ky0lhw0onwoSDJR4GK6t3g -X-ContainerType=simple - - -- cgit v1.2.3