From 2afd7c421b99c3c29a4de7ed3a0ceb711d29e3f7 Mon Sep 17 00:00:00 2001 From: jintusebastian Date: Tue, 21 Nov 2023 22:56:59 +0530 Subject: [PATCH] remove docker swarm from product --- .gitmodules | 6 - config/blobs.yml | 100 ------ ...servicefabrik.io_v1alpha1_dockerbinds.yaml | 61 ---- ...ent.servicefabrik.io_v1alpha1_dockers.yaml | 64 ---- jobs/docker/monit | 13 - jobs/docker/spec | 173 ---------- jobs/docker/templates/bin/cgroupfs-mount | 25 -- jobs/docker/templates/bin/docker_ctl.erb | 190 ----------- .../templates/bin/job_properties.sh.erb | 232 -------------- jobs/docker/templates/bin/lvmvd_ctl.erb | 300 ------------------ jobs/docker/templates/bin/post-start.erb | 8 - .../templates/config/docker-logrotate.erb | 9 - .../docker/templates/config/docker.cacert.erb | 1 - jobs/docker/templates/config/docker.cert.erb | 1 - jobs/docker/templates/config/docker.key.erb | 1 - .../templates/config/settings.yml.erb | 12 - .../templates/config/settings.yml.erb | 11 - .../templates/config/settings.yml.erb | 12 - .../templates/config/settings.yml.erb | 12 - jobs/service-fabrik-broker/spec | 38 +-- .../templates/bin/job_properties.sh.erb | 4 +- .../templates/config/settings.yml.erb | 12 - jobs/service-fabrik-docker-manager/monit | 5 - jobs/service-fabrik-docker-manager/spec | 22 -- .../templates/bin/job_properties.sh.erb | 27 -- .../bin/service-fabrik-docker-manager_ctl.erb | 44 --- .../templates/config/settings.yml.erb | 268 ---------------- .../templates/config/settings.yml.erb | 12 - .../templates/config/settings.yml.erb | 11 - .../templates/config/settings.yml.erb | 13 +- jobs/swarm_manager/monit | 5 - jobs/swarm_manager/spec | 92 ------ .../templates/bin/job_properties.sh.erb | 111 ------- .../templates/bin/swarm_manager_ctl | 56 ---- .../templates/config/docker.cacert.erb | 1 - .../templates/config/docker.cert.erb | 1 - .../templates/config/docker.key.erb | 1 - packages/docker/packaging | 46 --- packages/docker/spec | 7 - packages/lvm2/packaging | 40 --- packages/lvm2/spec | 8 - packages/lvmvd/packaging | 27 -- packages/lvmvd/spec | 6 - packages/swarm/packaging | 41 --- packages/swarm/spec | 6 - src/github.com/docker/swarm | 1 - src/lvm-volume-driver | 1 - 47 files changed, 22 insertions(+), 2115 deletions(-) delete mode 100644 crds/bind.servicefabrik.io_v1alpha1_dockerbinds.yaml delete mode 100644 crds/deployment.servicefabrik.io_v1alpha1_dockers.yaml delete mode 100755 jobs/docker/monit delete mode 100755 jobs/docker/spec delete mode 100755 jobs/docker/templates/bin/cgroupfs-mount delete mode 100755 jobs/docker/templates/bin/docker_ctl.erb delete mode 100755 jobs/docker/templates/bin/job_properties.sh.erb delete mode 100755 jobs/docker/templates/bin/lvmvd_ctl.erb delete mode 100755 jobs/docker/templates/bin/post-start.erb delete mode 100644 jobs/docker/templates/config/docker-logrotate.erb delete mode 100644 jobs/docker/templates/config/docker.cacert.erb delete mode 100644 jobs/docker/templates/config/docker.cert.erb delete mode 100644 jobs/docker/templates/config/docker.key.erb delete mode 100644 jobs/service-fabrik-docker-manager/monit delete mode 100644 jobs/service-fabrik-docker-manager/spec delete mode 100644 jobs/service-fabrik-docker-manager/templates/bin/job_properties.sh.erb delete mode 100644 jobs/service-fabrik-docker-manager/templates/bin/service-fabrik-docker-manager_ctl.erb delete mode 100644 jobs/service-fabrik-docker-manager/templates/config/settings.yml.erb delete mode 100644 jobs/swarm_manager/monit delete mode 100644 jobs/swarm_manager/spec delete mode 100755 jobs/swarm_manager/templates/bin/job_properties.sh.erb delete mode 100755 jobs/swarm_manager/templates/bin/swarm_manager_ctl delete mode 100644 jobs/swarm_manager/templates/config/docker.cacert.erb delete mode 100644 jobs/swarm_manager/templates/config/docker.cert.erb delete mode 100644 jobs/swarm_manager/templates/config/docker.key.erb delete mode 100755 packages/docker/packaging delete mode 100755 packages/docker/spec delete mode 100644 packages/lvm2/packaging delete mode 100644 packages/lvm2/spec delete mode 100644 packages/lvmvd/packaging delete mode 100644 packages/lvmvd/spec delete mode 100644 packages/swarm/packaging delete mode 100644 packages/swarm/spec delete mode 160000 src/github.com/docker/swarm delete mode 160000 src/lvm-volume-driver diff --git a/.gitmodules b/.gitmodules index 3158ac746..585d09e88 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,3 @@ [submodule "src/service-fabrik-broker"] path = src/github.com/cloudfoundry-incubator/service-fabrik-broker url = https://github.com/sap/service-fabrik-broker.git -[submodule "src/github.com/docker/swarm"] - path = src/github.com/docker/swarm - url = https://github.com/docker/swarm.git -[submodule "src/lvm-volume-driver"] - path = src/lvm-volume-driver - url = https://github.com/sap/service-fabrik-lvm-volume-driver diff --git a/config/blobs.yml b/config/blobs.yml index 388cec406..384b3ab79 100644 --- a/config/blobs.yml +++ b/config/blobs.yml @@ -1,99 +1,3 @@ -apt/bionic/lvm2/dmeventd_1.02.145-4.1ubuntu3_amd64.deb: - size: 30416 - object_id: dce5c468-7c98-4f71-730b-7674cf8335b9 - sha: sha256:b0d0e23f145d1124f6be1657226a9349d4fbc6814a9184bab43461db59710cb5 -apt/bionic/lvm2/libdevmapper-event1.02.1_1.02.145-4.1ubuntu3_amd64.deb: - size: 10896 - object_id: fc851e9c-619e-46e3-565d-04612aea289e - sha: sha256:9ac145d86613dd6645a213fbd6f49622dcb49d1960e2670fe59de5af658f10c2 -apt/bionic/lvm2/liblvm2app2.2_2.02.176-4.1ubuntu3_amd64.deb: - size: 433196 - object_id: da5480da-2fe4-4695-5437-86479b7f5fa0 - sha: sha256:c500fdfeb70e30253e82afcb3787b039a9d4db24a70c2401c2db5629960d44b3 -apt/bionic/lvm2/liblvm2cmd2.02_2.02.176-4.1ubuntu3_amd64.deb: - size: 585560 - object_id: 533c0af7-02d0-4c13-64f1-29b5137971c2 - sha: sha256:4cb3d032e27a860885ffefe6ef84f30220d59802e27e4ffe80c4b8b968409446 -apt/bionic/lvm2/lvm2_2.02.176-4.1ubuntu3_amd64.deb: - size: 928612 - object_id: fb7474f6-3db8-4285-60d4-1115a218aab3 - sha: sha256:e62e8b4eaab506eee39be32c7f2474a18ff507c5c9cf40ffea2d99dd7d6891ee -apt/jammy/dmeventd_1.02.175-2.1ubuntu4_amd64.deb: - size: 38362 - object_id: fb9ba548-a622-4de1-4b0d-9e0f12fb7dd7 - sha: sha256:d63e56757791e9f32e6a3f6b1bfd6b654a039fced0f7c8c1532705872f6ee1c1 -apt/jammy/libdevmapper-event1.02.1_1.02.175-2.1ubuntu4_amd64.deb: - size: 12626 - object_id: 73c55657-2bfb-41fd-73be-37eea159a18f - sha: sha256:86d7c9c81889fa3440ee14738dfc849d321c797cc35c18fcb561c16f7dc20780 -apt/jammy/liblvm2cmd2.03_2.03.11-2.1ubuntu4_amd64.deb: - size: 756486 - object_id: 4cea503b-53a3-4eee-45e4-e026df2d1f46 - sha: sha256:f7c7fe9e51d2a76d56b14e1c3155870d30ca28b487f6113e938f9e456a8000c2 -apt/jammy/lvm2_2.03.11-2.1ubuntu4_amd64.deb: - size: 1154112 - object_id: ea512fe1-4528-40b3-666a-903698ae3325 - sha: sha256:4cd12a47ca9d05b3c93aaa78e51cb880e9b0f67e67c9dd29fba63ac2cee5b9cf -apt/jammy/thin-provisioning-tools_0.9.0-2ubuntu1_amd64.deb: - size: 426228 - object_id: f8e9f4a9-cc53-4621-7ca2-1c834770d2d6 - sha: sha256:32508138098821fa7eb7635fa8877db60ae028706e6b8716361fcbea3a4184b8 -apt/lvm2/libdevmapper-event1.02.1_2:1.02.77-6ubuntu2_amd64.deb: - size: 10812 - object_id: 67e8628d-c7a4-4182-8fdd-4cddd60bcaa0 - sha: 2873ddde9dfa3897918fb48a470fdf6ba511e182 -apt/lvm2/libreadline5_5.2+dfsg-2_amd64.deb: - size: 130428 - object_id: 2f4d6377-7c29-470b-a917-acdcb05e0c75 - sha: 5e0e4d8cbad5302244c06f79f74497a30754f8af -apt/lvm2/lvm2_2.02.98-6ubuntu2_amd64.deb: - size: 469600 - object_id: 3bbf149a-e117-4d5e-9667-3632ae9c0b95 - sha: 52bca696115b57cd1ad1aa5afe187001f72c5ee2 -apt/lvm2/watershed_7_amd64.deb: - size: 11356 - object_id: a72d0857-ae9b-4b2f-b5b6-725bee7006d9 - sha: 5c02014b7daecff6c0a6367996d2819d9b16745e -apt/xenial/lvm2/dmeventd_2_1.02.110-1ubuntu10_amd64.deb: - size: 31272 - object_id: 2f9f1860-82ee-4f32-5c8e-e6a74bd31a06 - sha: dc8240ec16cbbfe80dff668dc33c0608790d7248 -apt/xenial/lvm2/libdevmapper-event1.02.1_2_1.02.110-1ubuntu10_amd64.deb: - size: 12240 - object_id: d18cbdc0-50b8-4e92-6fe8-9c93549530e6 - sha: 4f56f12cb631d9bca26996712338406d9e49ee4b -apt/xenial/lvm2/liblvm2app2.2_2.02.133-1ubuntu10_amd64.deb: - size: 391652 - object_id: 8509d908-7d52-4572-5086-d68299ead366 - sha: 5647def3e295f47c057f6a228b08b6abbf560fd3 -apt/xenial/lvm2/liblvm2cmd2.02_2.02.133-1ubuntu10_amd64.deb: - size: 517716 - object_id: a9733984-7925-49a4-7193-3e299bfc1df3 - sha: 935f81f8f6dced140808b37cf95a055144213071 -apt/xenial/lvm2/lvm2_2.02.133-1ubuntu10_amd64.deb: - size: 731404 - object_id: 59ced7d6-e938-403b-63e4-b12a4a218895 - sha: 7f2265d8c326e0713e3ccdf41823d9248aa0c9a0 -docker/aufs-tools_20120411-3_amd64.deb: - size: 91762 - object_id: b95dca91-e344-4c54-a908-68651b81264f - sha: 2dfc1fe386cd3f05ac7e0b4ebcf3ebc8a7f3b04d -docker/autoconf-2.69.tar.gz: - size: 1927468 - object_id: 83391b7e-d4bf-4052-92bb-e708f33e25c6 - sha: 562471cbcb0dd0fa42a76665acf0dbb68479b78a -docker/docker-18.09.2.tgz: - size: 48020699 - object_id: c9a25eb3-2d23-457f-714d-0c370916a687 - sha: sha256:183e10448f0c3a0dc82c9d504c5280c29527b89af0fc71cb27115d684b26c8bd -docker/docker-19.03.3.tgz: - size: 63244685 - object_id: 709b25a0-a988-48c5-4963-f831926d8030 - sha: sha256:c3c8833e227b61fe6ce0bc5c17f97fa547035bef4ef17cf6601f30b0f20f4ce5 -docker/swarm-1.2.9.zip: - size: 2151106 - object_id: 64eda587-2fd4-43d8-6a2b-760c7986ebb9 - sha: sha256:7e30ffe9f83f2d05d00e1a715ff0b558ca098dcff069a28aefb918fce961c884 golang/go1.21.4.linux-amd64.tar.gz: size: 66615271 object_id: ec42dea1-3f00-47fe-4753-21638ba6c935 @@ -114,10 +18,6 @@ kubernetes-1.18.2/kubectl: size: 44032000 object_id: 340be2a6-a632-4a08-47de-13f813683f39 sha: sha256:6ea8261b503c6c63d616878837dc70b758d4a3aeb9996ade8e83b51aedac9698 -libseccomp/libseccomp-2.3.3.tar.gz: - size: 564546 - object_id: 4e749385-3bc6-45b5-7a08-906c3cf97573 - sha: 89b1f35447b1891a3051de979dc92ad9f7258b60 libseccomp/libseccomp-2.5.4.tar.gz: size: 637228 object_id: 2718ca1d-3eb3-43a2-5cf9-f29b4dcc74f2 diff --git a/crds/bind.servicefabrik.io_v1alpha1_dockerbinds.yaml b/crds/bind.servicefabrik.io_v1alpha1_dockerbinds.yaml deleted file mode 100644 index e2d746db7..000000000 --- a/crds/bind.servicefabrik.io_v1alpha1_dockerbinds.yaml +++ /dev/null @@ -1,61 +0,0 @@ -apiVersion: apiextensions.k8s.io/v1 -kind: CustomResourceDefinition -metadata: - annotations: - controller-gen.kubebuilder.io/version: v0.2.4 - creationTimestamp: null - name: dockerbinds.bind.servicefabrik.io -spec: - group: bind.servicefabrik.io - names: - kind: DockerBind - listKind: DockerBindList - plural: dockerbinds - singular: dockerbind - scope: Namespaced - versions: - - name: v1alpha1 - schema: - openAPIV3Schema: - description: DockerBind is the Schema for the dockerbinds API - properties: - apiVersion: - description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' - type: string - kind: - description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' - type: string - metadata: - type: object - spec: - description: DockerBindSpec defines the desired state of DockerBind - properties: - instance: - description: Instance is the instance id for this resource - type: string - options: - description: Options contains the stringified json options - type: string - type: object - status: - description: DockerBindStatus defines the observed state of DockerBind - properties: - error: - description: Error contains error description - type: string - response: - description: Response contains the stringified json response - type: string - state: - description: State contains the state of the object - type: string - type: object - type: object - served: true - storage: true -status: - acceptedNames: - kind: "" - plural: "" - conditions: [] - storedVersions: [] \ No newline at end of file diff --git a/crds/deployment.servicefabrik.io_v1alpha1_dockers.yaml b/crds/deployment.servicefabrik.io_v1alpha1_dockers.yaml deleted file mode 100644 index 1cb471150..000000000 --- a/crds/deployment.servicefabrik.io_v1alpha1_dockers.yaml +++ /dev/null @@ -1,64 +0,0 @@ -apiVersion: apiextensions.k8s.io/v1 -kind: CustomResourceDefinition -metadata: - annotations: - controller-gen.kubebuilder.io/version: v0.2.4 - creationTimestamp: null - name: dockers.deployment.servicefabrik.io -spec: - group: deployment.servicefabrik.io - names: - kind: Docker - listKind: DockerList - plural: dockers - singular: docker - scope: Namespaced - versions: - - name: v1alpha1 - schema: - openAPIV3Schema: - description: Docker is the Schema for the dockers API - properties: - apiVersion: - description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' - type: string - kind: - description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' - type: string - metadata: - type: object - spec: - description: DockerSpec defines the desired state of Docker - properties: - options: - description: Options contains the stringified json options - type: string - type: object - status: - description: DockerStatus defines the observed state of Docker - properties: - appliedOptions: - description: AppliedOptions is the last successfully applied options - type: string - error: - description: Error contains error description - type: string - lastOperation: - description: LastOperation contains the stringified json status of last operation - type: string - response: - description: Response contains the stringified json response - type: string - state: - description: State contains the state of the object - type: string - type: object - type: object - served: true - storage: true -status: - acceptedNames: - kind: "" - plural: "" - conditions: [] - storedVersions: [] \ No newline at end of file diff --git a/jobs/docker/monit b/jobs/docker/monit deleted file mode 100755 index 7a8f7535a..000000000 --- a/jobs/docker/monit +++ /dev/null @@ -1,13 +0,0 @@ -<% if !p('lvmvd.disabled') then %>check process lvmvd - with pidfile /var/vcap/sys/run/docker/lvmvd.pid - group vcap - start program "/var/vcap/packages/bosh-helpers/monit_debugger lvmvd_ctl '/var/vcap/jobs/docker/bin/lvmvd_ctl start'" with timeout 900 seconds # time required to install packages - stop program "/var/vcap/packages/bosh-helpers/monit_debugger lvmvd_ctl '/var/vcap/jobs/docker/bin/lvmvd_ctl stop'" with timeout 600 seconds # time required to stop all containers -<% end %> -check process docker - with pidfile /var/vcap/sys/run/docker/docker.pid - group vcap<% if !p('lvmvd.disabled') then %> - depends on lvmvd<% end %> - start program "/var/vcap/packages/bosh-helpers/monit_debugger docker_ctl '/var/vcap/jobs/docker/bin/docker_ctl start'" with timeout 300 seconds # time required to start all containers - stop program "/var/vcap/packages/bosh-helpers/monit_debugger docker_ctl '/var/vcap/jobs/docker/bin/docker_ctl stop'" with timeout 600 seconds # time required to stop all containers - if failed unixsocket /var/vcap/sys/run/docker/docker.sock with timeout 5 seconds for 5 cycles then restart diff --git a/jobs/docker/spec b/jobs/docker/spec deleted file mode 100755 index a6cf08827..000000000 --- a/jobs/docker/spec +++ /dev/null @@ -1,173 +0,0 @@ ---- -name: docker - -packages: - - bosh-helpers - - docker - - lvm2 - - lvmvd - -templates: - bin/cgroupfs-mount: bin/cgroupfs-mount - bin/docker_ctl.erb: bin/docker_ctl - bin/job_properties.sh.erb: bin/job_properties.sh - bin/post-start.erb: bin/post-start - bin/lvmvd_ctl.erb: bin/lvmvd_ctl - config/docker.cacert.erb: config/docker.cacert - config/docker.cert.erb: config/docker.cert - config/docker.key.erb: config/docker.key - config/docker-logrotate.erb: config/docker-logrotate - -properties: - docker.name: - description: "Name of service fabrik docker, used for syslog shipper" - default: "service_fabrik_docker" - docker.tcp_address: - description: "TCP address where Docker daemon will listen to (if not set, TCP will not be available)" - default: "127.0.0.1" - docker.tcp_port: - description: "TCP port where Docker daemon will listen to (if not set, TCP will not be available)" - default: "4243" - docker.api_cors_header: - description: "Set CORS headers in the remote API" - default: false - docker.bridge: - description: "Name of the network bridge to attach containers (defaults to docker0)" - docker.cidr_prefix: - description: "CIDR notation prefix (first 2 octets) for the network bridges IP" - docker.debug: - description: "Enable debug mode" - default: false - docker.default_gateway: - description: "Container default gateway IPv4 address" - docker.default_gateway_v6: - description: "Container default gateway IPv6 address" - docker.default_ulimits: - description: "Array of default ulimits for containers" - docker.dns_servers: - description: "Array of DNS servers to be used" - docker.dns_options: - description: "Array of DNS options to be used" - docker.dns_search: - description: "Array of DNS search domains to be used" - docker.exec_options: - description: "Array of exec driver options" - docker.icc: - description: "true: Allow unrestricted inter-container and Docker daemon host communication" - default: false - docker.insecure_registries: - description: "Array of insecure registries (no certificate verification for HTTPS and enable HTTP fallback)" - docker.ip: - description: "Default IP when binding container ports" - docker.ip_forward: - description: "Enable net.ipv4.ip_forward and IPv6 forwarding" - default: true - docker.ip_masq: - description: "Enable IP masquerading" - default: true - docker.iptables: - description: "Enable Docker's addition of iptables rules" - default: true - docker.ipv6: - description: "Enable IPv6 networking" - default: false - docker.labels: - description: "Array of key=value labels for the daemon" - docker.log_level: - description: "Set the logging level (debug, info, warn, error, fatal)" - default: "info" - docker.log_driver: - description: "Default driver for container logs" - docker.log_options: - description: "Array of log driver options" - docker.mtu: - description: "Set the containers network MTU (if no value is provided: default to the default route MTU or 1500 if no default route is available)" - docker.registry_mirrors: - description: "Array of preferred Docker registry mirrors" - docker.selinux_enable: - description: "Enable selinux support" - default: false - docker.storage_driver: - description: "Use a specific storage driver" - docker.storage_options: - description: "Array of storage driver options" - docker.tls: - description: "Use TLS" - default: false - common.tls_cacert: - description: "Trust only remotes providing a certificate signed by the CA given here" - docker.tls_cert: - description: "TLS certificate file" - docker.tls_key: - description: "TLS key file" - docker.tls_verify: - description: "Use TLS and verify the remote" - default: false - docker.userland_proxy: - description: "Use userland proxy for loopback traffic" - default: true - docker.ulimit.nofile: - description: "Maximum number of open files" - default: 8192 - docker.enable_userns: - description: "Enable usernamespace" - default: false - docker.logrotate.count: - description: "Max number of log files per container" - default: 5 - docker.logrotate.size: - description: "Log file size threshold per container" - default: 2M - docker.logrotate.interval: - description: "Specify the interval of daily, weekly, monthly or yearly" - - docker.volume.mount_dir: - description: "directory on which NFS volume is mounted on docker node" - default: "/var/vcap/store" - - docker.daemon.keyfile: - description: "location where docker keeps key file in persistence disk" - default: "/var/vcap/store/docker/key.json" - - docker.logs_dir: - description: "logs directory of docker" - default: "/var/vcap/sys/log/docker" - - env.http_proxy: - description: "HTTP proxy that Docker should use" - env.https_proxy: - description: "HTTPS proxy that Docker should use" - env.no_proxy: - description: "List of comma-separated hosts that Docker should skip connecting to the proxy" - - lvmvd.disabled: - description: "Disable use of the Docker volume driver (e.g. bosh-lite)." - default: false - lvmvd.default_size: - description: "Default size for a Docker volume (in megabytes) if no size can be deduced from volume name" - default: 768 - lvmvd.mount_dir: - description: "Directory where mount points will be created" - default: "/var/vcap/store/lvmvd/mountpoints" - lvmvd.volume_file_location: - description: "Location of the volume group file (the name will be derived from the volume group name)" - default: "/var/vcap/store/lvmvd/" - lvmvd.volume_group_name: - description: "Name of volume group which will be used for creating the logical volumes" - default: "service-vg" - lvmvd.socket_file: - description: "Socket file where the lvmvd daemon will be listening on (note: docker currently does not look into the /var/vcap/run/docker/plugins directory for plugin socket files)" - default: "/run/docker/plugins/lvm-volume-driver.sock" - lvmvd.pv_size: - description: "Size of physical volume (sparse file in gigabytes; must match desired x + some extra bytes)" - default: "61" - lvmvd.loop_device: - description: "The Loopback device to be use with the Volume Driver" - default: "/dev/loop1" - - broker.syslog.host: - description: "Syslog ingestor host IP of ELK stack" - default: "10.1.4.3" - broker.syslog.port: - description: "Syslog ingestor Port" - default: 5514 diff --git a/jobs/docker/templates/bin/cgroupfs-mount b/jobs/docker/templates/bin/cgroupfs-mount deleted file mode 100755 index 3b264c648..000000000 --- a/jobs/docker/templates/bin/cgroupfs-mount +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh - -set -e - -if grep -v '^#' /etc/fstab | grep -q cgroup || [ ! -e /proc/cgroups ] || [ ! -d /sys/fs/cgroup ]; then - mkdir -p /sys/fs/cgroup -fi - -if ! mountpoint -q /sys/fs/cgroup; then - mount -t tmpfs -o uid=0,gid=0,mode=0755 cgroup /sys/fs/cgroup -fi - -( - cd /sys/fs/cgroup - for sys in $(awk '!/^#/ { if ($4 == 1) print $1 }' /proc/cgroups); do - mkdir -p $sys - if ! mountpoint -q $sys; then - if ! mount -n -t cgroup -o $sys cgroup $sys; then - rmdir $sys || true - fi - fi - done -) - -exit 0 diff --git a/jobs/docker/templates/bin/docker_ctl.erb b/jobs/docker/templates/bin/docker_ctl.erb deleted file mode 100755 index d1eb1f8c9..000000000 --- a/jobs/docker/templates/bin/docker_ctl.erb +++ /dev/null @@ -1,190 +0,0 @@ -#!/bin/bash - -set -e # exit immediately if a simple command exits with a non-zero status - -# Setup common env vars and folders -source /var/vcap/packages/bosh-helpers/ctl_setup.sh 'docker' -export DOCKER_PID_FILE=${DOCKER_PID_DIR}/docker.pid -export PATH="/var/vcap/packages/docker/bin:$PATH" - -case $1 in - - start) - pid_guard ${DOCKER_PID_FILE} ${JOB_NAME} - - # Install aufs-tools - - # check if package already installed else install, incase package not found - # using dpkg -s for checking the installation which does not lock the /var/lib/dpkg/lock - - - set +e - if ! dpkg -s aufs-tools > /dev/null 2>&1 ; then - echo "Installing debian package aufs-tools" - set -e - dpkg -i "$(ls /var/vcap/packages/docker/aufs-tools_*.deb | head -1)" - set +e - fi - set -e - - # Enable logrotate via a cron job. - # Note : Logrotate is configured in the bosh stemcell to run every 15 mins and the same is leveraged in the below . - if [ ! -L /etc/logrotate.d/docker-logrotate ]; then - ln -s /var/vcap/jobs/docker/config/docker-logrotate /etc/logrotate.d/docker-logrotate - fi - - # Create docker data store - if [ ! -d ${DOCKER_STORE_DIR}/docker ]; then - mkdir -p ${DOCKER_STORE_DIR}/docker - chmod 770 ${DOCKER_STORE_DIR}/docker - fi - - # Set ulimits - ulimit -n ${DOCKER_ULIMIT_NOFILE} - - # Open up the docker demon port, remove any drop rule on the port - set +e - iptables -D INPUT -p tcp --dport ${DOCKER_TCP_PORT} -j DROP - set -e - - # Mount cgroupfs hierarchy - ${JOB_DIR}/bin/cgroupfs-mount - - # Create user for usernamespace if DOCKER_ENABLE_USERNS is true - if [ ! -z ${DOCKER_ENABLE_USERNS} ]; then - set +e - egrep -i "^dockremap:" /etc/passwd - if [ $? -ne 0 ]; then - sudo useradd --no-create-home --system dockremap - fi - egrep -i "^dockremap:" /etc/subuid - if [ $? -ne 0 ]; then - sudo sh -c 'echo dockremap:500000:65536 >> /etc/subuid' - fi - egrep -i "^dockremap:" /etc/subgid - if [ $? -ne 0 ]; then - sudo sh -c 'echo dockremap:500000:65536 >> /etc/subgid' - fi - set -e - fi - - # ensure /etc/docker exists - if [[ ! -d /etc/docker ]] ; then - mkdir /etc/docker - fi - # create symlink from /etc/docker/key.json to /var/vcap/store/docker/key.json - if [[ -f "${DOCKER_DAEMON_KEY_FILE_ARG}" ]]; then - # let docker start with key located at default /etc/docker/key.json - # if /var/vcap/store/docker/key.json doesn't exist. - # Scratch install or new docker vm scenario - - # backup /etc/docker/key.json from previous run and symlink it to /var/vcap/store/docker/key.json - if [[ ! -f /etc/docker/key.json ]] ; then - ln -s "${DOCKER_DAEMON_KEY_FILE_ARG}" /etc/docker/key.json - else - link_target=$(readlink -f /etc/docker/key.json) - if [[ "${link_target}" != "${DOCKER_DAEMON_KEY_FILE_ARG}" ]]; then - mv /etc/docker/key.json /etc/docker/key.json.backup - ln -s "${DOCKER_DAEMON_KEY_FILE_ARG}" /etc/docker/key.json - fi - fi - fi - - # Start Docker daemon - exec dockerd \ - ${DOCKER_API_CORS_HEADER} \ - ${DOCKER_BRIDGE:-} \ - ${DOCKER_DEBUG} \ - ${DOCKER_DEFAULT_GATEWAY:-} \ - ${DOCKER_DEFAULT_GATEWAY_V6:-} \ - ${DOCKER_DEFAULT_ULIMITS:-} \ - ${DOCKER_DNS_SERVERS:-} \ - ${DOCKER_DNS_OPTIONS:-} \ - ${DOCKER_DNS_SEARCH:-} \ - ${DOCKER_EXEC_OPTIONS:-} \ - ${DOCKER_ENABLE_USERNS:-} \ - --exec-root ${DOCKER_DATA_DIR} \ - --group vcap \ - --data-root ${DOCKER_STORE_DIR}/docker \ - --host unix://${DOCKER_PID_DIR}/docker.sock \ - ${DOCKER_ICC} \ - ${DOCKER_INSECURE_REGISTRIES:-} \ - ${DOCKER_IP:-} \ - ${DOCKER_IPFORWARD} \ - ${DOCKER_IPMASQ} \ - ${DOCKER_IPTABLES} \ - ${DOCKER_IPV6} \ - ${DOCKER_LABELS:-} \ - ${DOCKER_LOG_LEVEL} \ - ${DOCKER_LOG_DRIVER:-} \ - ${DOCKER_LOG_OPTIONS:-} \ - ${DOCKER_MTU:-} \ - --pidfile ${DOCKER_PID_FILE} \ - ${DOCKER_REGISTRY_MIRRORS:-} \ - ${DOCKER_SELINUX_ENABLED} \ - ${DOCKER_STORAGE_DRIVER:-} \ - ${DOCKER_STORAGE_OPTIONS:-} \ - ${DOCKER_TCP:-} \ - ${DOCKER_TLS} \ - ${DOCKER_TLS_CACERT:-} \ - ${DOCKER_TLS_CERT:-} \ - ${DOCKER_TLS_KEY:-} \ - ${DOCKER_TLS_VERIFY_OPTION:-} \ - ${DOCKER_USERLAND_PROXY} \ - >>${DOCKER_LOG_DIR}/${OUTPUT_LABEL}.stdout.log \ - 2>>${DOCKER_LOG_DIR}/${OUTPUT_LABEL}.stderr.log - ;; - - stop) - set +e - # Stop Docker containers - - # Before stopping the docker deamon & containers block the demon port so that no further create - # request are allowed/serviced during the stopping process, else if any create container request - # is allowed in-between it will keep using the lvm volume which will keep the corresponding device - # busy and not allowing device to be unmounted during node update. - iptables -A INPUT -p tcp --dport ${DOCKER_TCP_PORT} -j DROP - export DOCKER_HOST="unix://${DOCKER_PID_DIR}/docker.sock" - - # It is necessary to unset following variables due to this issue: https://github.com/moby/moby/issues/36535 - # We are in fact not using DOCKER_TLS_VERIFY, but DOCKER_TLS is sourced for monit start, which causes below - # docker-cli commands to connect over TLS to docker daemon even over unix socket due to above bug in CLI. - export DOCKER_TLS= - export DOCKER_TLS_VERIFY= - alias docker='/var/vcap/packages/docker/bin/docker' - echo "Stopping docker containers..." - containers="$(docker ps -q)" - if [[ ! -z $containers ]]; then - for container in $containers - do - echo "Stopping docker container ${container} gracefully or kill it after grace period" - docker stop -t 5 ${container} - done - fi - - sleep 10s - # forcefully kill all the containers that did not stop for any reason - docker kill $(docker ps -q) - - # Stop Docker daemon - echo -n "Stopping docker daemon..." - kill_and_wait ${DOCKER_PID_FILE} - - # Unblock the port docker demon port by removing the rule - iptables -D INPUT -p tcp --dport ${DOCKER_TCP_PORT} -j DROP - set -e - - # Ensure key file exists at /var/vcap/store/docker/key.json - if [[ ! -f "${DOCKER_DAEMON_KEY_FILE_ARG}" ]] && [[ -f /etc/docker/key.json ]] ; then - touch "${DOCKER_DAEMON_KEY_FILE_ARG}" - cp /etc/docker/key.json "${DOCKER_DAEMON_KEY_FILE_ARG}" - fi - ;; - - *) - echo "Usage: $0 {start|stop}" - exit 1 - ;; - -esac -exit 0 diff --git a/jobs/docker/templates/bin/job_properties.sh.erb b/jobs/docker/templates/bin/job_properties.sh.erb deleted file mode 100755 index 0e52a3bad..000000000 --- a/jobs/docker/templates/bin/job_properties.sh.erb +++ /dev/null @@ -1,232 +0,0 @@ -#!/usr/bin/env bash - -# -# Docker properties -# - -# Directory to store the Docker configuration files -export DOCKER_CONF_DIR=${JOB_DIR}/config - -# Directory to store the Docker logs -export DOCKER_LOG_DIR=${LOG_DIR} - -# Directory to store the Docker process IDs -export DOCKER_PID_DIR=${RUN_DIR} -export DOCKER_RUN_DIR=${RUN_DIR} - -# Directory to store the Docker exec files -export DOCKER_DATA_DIR=${DATA_DIR} - -# Directory to store the Docker data files -export DOCKER_STORE_DIR=${STORE_DIR} - -# Directory to store the Docker temp files -export DOCKER_TMP_DIR=${TMP_DIR} - -<% if_p('docker.tcp_address', 'docker.tcp_port') do |address, port| %> -# TCP Address/Port where Docker daemon will listen to -export DOCKER_TCP="--host tcp://<%= address %>:<%= port %>" -export DOCKER_TCP_PORT="<%= port %>" -<% end %> - -# Set CORS headers in the remote API -export DOCKER_API_CORS_HEADER="--api-cors-header=<%= p('docker.api_cors_header') %>" - -<% if_p('docker.bridge', 'docker.cidr_prefix') do |bridge, cidr_prefix| %> -# Attach containers to a network bridge -export DOCKER_BRIDGE="--bridge=<%= bridge %>" -export DOCKER_BRIDGE_NAME="<%= bridge %>" -export DOCKER_BRIDGE_CIDR="<%= cidr_prefix %>.<%= index %>.1/24" -<% end %> - -# Enable debug mode -export DOCKER_DEBUG="--debug=<%= p('docker.debug') %>" - -<% if_p('docker.default_gateway') do |default_gateway| %> -# Container default gateway IPv4 address -export DOCKER_DEFAULT_GATEWAY="--default-gateway=<%= default_gateway %>" -<% end %> - -<% if_p('docker.default_gateway_v6') do |default_gateway_v6| %> -# Container default gateway IPv6 address -export DOCKER_DEFAULT_GATEWAY_V6="--default-gateway-v6=<%= default_gateway_v6 %>" -<% end %> - -<% if_p('docker.default_ulimits') do |default_ulimits| %> -# Set default ulimits for containers -export DOCKER_DEFAULT_ULIMITS="<%= default_ulimits.map { |default_ulimit| "--default-ulimit=#{default_ulimit}" }.join(' ') %>" -<% end %> - -<% if_p('docker.dns_servers') do |dns_servers| %> -# DNS servers to be used -export DOCKER_DNS_SERVERS="<%= dns_servers.map { |dns_server| "--dns=#{dns_server}" }.join(' ') %>" -<% end %> - -<% if_p('docker.dns_options') do |dns_options| %> -# DNS options to be used -export DOCKER_DNS_OPTIONS="<%= dns_options.map { |dns_option| "--dns-opt=#{dns_option}" }.join(' ') %>" -<% end %> - -<% if_p('docker.dns_search') do |domains| %> -# DNS search domains to be used -export DOCKER_DNS_SEARCH="<%= domains.map { |domain| "--dns-search=#{domain}" }.join(' ') %>" -<% end %> - -<% if_p('docker.exec_options') do |exec_options| %> -# Set exec driver options -export DOCKER_EXEC_OPTIONS="<%= exec_options.map { |exec_option| "--exec-opt=#{exec_option}" }.join(' ') %>" -<% end %> - -# Allow unrestricted inter-container and Docker daemon host communication -export DOCKER_ICC="--icc=<%= p('docker.icc') %>" - -<% if_p('docker.insecure_registries') do |insecure_registries| %> -# Insecure registries -export DOCKER_INSECURE_REGISTRIES="<%= insecure_registries.map { |insecure_registry| "--insecure-registry=#{insecure_registry}" }.join(' ') %>" -<% end %> - -<% if_p('docker.ip') do |ip| %> -# Default IP when binding container ports -export DOCKER_IP="--ip=<%= ip %>" -<% end %> - -<% if p('docker.enable_userns', false) then %> -# Enable user namespace -export DOCKER_ENABLE_USERNS="--userns-remap=default" -<% end %> - -# Enable net.ipv4.ip_forward and IPv6 forwarding -export DOCKER_IPFORWARD="--ip-forward=<%= p('docker.ip_forward') %>" - -# Enable IP masquerading for bridge's IP range -export DOCKER_IPMASQ="--ip-masq=<%= p('docker.ip_masq') %>" - -# Enable Docker addition of iptables rules -export DOCKER_IPTABLES="--iptables=<%= p('docker.iptables') %>" - -# Enable IPv6 networking -export DOCKER_IPV6="--ipv6=<%= p('docker.ipv6') %>" - -<% if_p('docker.labels') do |labels| %> -# Daemon labels -export DOCKER_LABELS="<%= labels.map { |label| "--label=#{label}" }.join(' ') %>" -<% end %> - -# Set the logging level -export DOCKER_LOG_LEVEL="--log-level=<%= p('docker.log_level') %>" - -<% if_p('docker.log_driver') do |log_driver| %> -# Default driver for container logs -export DOCKER_LOG_DRIVER="--log-driver=<%= log_driver %>" -<% end %> - -<% if_p('docker.log_options') do |log_options| %> -# Log driver options -export DOCKER_LOG_OPTIONS="<%= log_options.map { |log_option| "--log-opt=#{log_option}" }.join(' ') %>" -<% end %> - -<% if_p('docker.mtu') do |mtu| %> -# Set the containers network MTU -export DOCKER_MTU="--mtu=<%= mtu %>" -<% end %> - -<% if_p('docker.registry_mirrors') do |registry_mirrors| %> -# Preferred Docker registry mirrors -export DOCKER_REGISTRY_MIRRORS="<%= registry_mirrors.map { |registry_mirror| "--registry-mirror=#{registry_mirror}" }.join(' ') %>" -<% end %> - -# Enable selinux support -export DOCKER_SELINUX_ENABLED="--selinux-enabled=<%= p('docker.selinux_enable') %>" - -<% if_p('docker.storage_driver') do |storage_driver| %> -# Use a specific storage driver -export DOCKER_STORAGE_DRIVER="--storage-driver=<%= storage_driver %>" -<% end %> - -<% if_p('docker.storage_options') do |storage_options| %> -# Storage driver options -export DOCKER_STORAGE_OPTIONS="<%= storage_options.map { |storage_option| "--storage-opt=#{storage_option}" }.join(' ') %>" -<% end %> - -# Use TLS -export DOCKER_TLS="--tls=<%= p('docker.tls') %>" - -<% if_p('common.tls_cacert') do |tls_cacert| %> -# Trust only remotes providing a certificate signed by the CA given here -export DOCKER_TLS_CACERT="--tlscacert=${DOCKER_CONF_DIR}/docker.cacert" -<% end %> - -<% if_p('docker.tls_cert') do |tls_cert| %> -# Path to TLS certificate file -export DOCKER_TLS_CERT="--tlscert=${DOCKER_CONF_DIR}/docker.cert" -<% end %> - -<% if_p('docker.tls_key') do |tls_key| %> -# Path to TLS key file -export DOCKER_TLS_KEY="--tlskey=${DOCKER_CONF_DIR}/docker.key" -<% end %> - -<% if p('docker.tls_verify', true) %> -# Use TLS and verify the remote -export DOCKER_TLS_VERIFY_OPTION="--tlsverify=true" -<% end %> - -# Use userland proxy for loopback traffic -export DOCKER_USERLAND_PROXY="--userland-proxy=<%= p('docker.userland_proxy') %>" - -# Maximum number of open files -export DOCKER_ULIMIT_NOFILE=<%= p('docker.ulimit.nofile') %> - -# NFS Mount path on docker node -export DOCKER_VOLUME_MOUNTDIR=<%= p('docker.volume.mount_dir') %> - -# key file location argument passed to docker daemon -export DOCKER_DAEMON_KEY_FILE_ARG=<%= p('docker.daemon.keyfile') %> - -# Proxy configuration -<% if_p('env.http_proxy') do |http_proxy| %> -export HTTP_PROXY="<%= http_proxy %>" -export http_proxy="<%= http_proxy %>" -<% end %> -<% if_p('env.https_proxy') do |https_proxy| %> -export HTTPS_PROXY="<%= https_proxy %>" -export https_proxy="<%= https_proxy %>" -<% end %> -<% if_p('env.no_proxy') do |no_proxy| %> -export NO_PROXY="<%= no_proxy %>" -export no_proxy="<%= no_proxy %>" -<% end %> - - -# Directory to store the LVM Volume Driver process IDs -export LVMVD_PID_DIR=${RUN_DIR} - -# The location of the LVM Volume Driver pid file -export LVMVD_PID_FILE=${LVMVD_PID_DIR}/lvmvd.pid - -# Directory to store the Volume Driver logs -export LVMVD_LOG_DIR=${LOG_DIR} - -# Directory to store the Volume Driver data files -export LVMVD_STORE_DIR=${STORE_DIR} - -# The default Volumne size -export LVMVD_DEFAULT_SIZE=<%= p('lvmvd.default_size') %> - -# Directory of the Volume Driver mountpoints -export LVMVD_MOUNT_DIR=<%= p('lvmvd.mount_dir') %> - -# The name of the Volume Group -export LVMVD_VOLUME_GROUP_NAME=<%= p('lvmvd.volume_group_name') %> - -# The location of the sparse file -export LVMVD_PV_SPARSE_FILE=${LVMVD_STORE_DIR}/${LVMVD_VOLUME_GROUP_NAME}.img - -# The location of the LVM Volume Driver socket file -export LVMVD_SOCKET_FILE=<%= p('lvmvd.socket_file') %> - -# The size of the physical volume -export LVMVD_PV_SIZE=<%= p('lvmvd.pv_size') %> - -# The Loopback device to be use with the Volume Driver -export LVMVD_LOOP_DEVICE=<%= p('lvmvd.loop_device') %> diff --git a/jobs/docker/templates/bin/lvmvd_ctl.erb b/jobs/docker/templates/bin/lvmvd_ctl.erb deleted file mode 100755 index d862830ab..000000000 --- a/jobs/docker/templates/bin/lvmvd_ctl.erb +++ /dev/null @@ -1,300 +0,0 @@ - -#!/bin/bash - -set -e # exit immediately if a simple command exits with a non-zero status - -# Setup common env vars and folders -source /var/vcap/packages/bosh-helpers/ctl_setup.sh 'docker' 'lvmvd' - -create_loop() { - # test whether volume is already set up - name=$(losetup -a | grep "${LVMVD_LOOP_DEVICE}" | awk '{print $3}') - if [ "X$name" = "X" ]; then - losetup ${LVMVD_LOOP_DEVICE} ${LVMVD_PV_SPARSE_FILE} - fi - - if vgdisplay | grep -q "${LVMVD_VOLUME_GROUP_NAME}"; then - vgchange -ay ${LVMVD_VOLUME_GROUP_NAME} - fi -} - -retry_delete_loop() { - local i=0 - local tries=5 - local delay=2 - while [ true ] - do - set +e - delete_loop - if ! losetup -a | grep -F ${LVMVD_LOOP_DEVICE} &> /dev/null; then - # If 'delete_loop' was successful, the while-loop can be stopped - echo "$(date) delete_loop was successful" - break - fi - - # Otherwise (if the 'delete_loop' call above has failed), this block will be executed - echo "[RETRY DELETE_LOOP #$i]" - losetup -a # should not contain /dev/loop1: ... (/var/vcap/store/lvmvd/service-vg.img); if it isn't continue with the next lines - lsof $LVMVD_PV_SPARSE_FILE - fuser $LVMVD_PV_SPARSE_FILE - ps aux - set -e - - i=$[$i+1] - if [ $i -gt $tries ]; then - exit 1 - fi - sleep $[$delay**$i] - done -} - -delete_loop() { - local mounted_volumes=$(mount | grep "${LVMVD_MOUNT_DIR}" | awk '{print $3}') - for vol in $mounted_volumes; do - echo "$(date) Unmounting volume $vol" - umount $vol - done - vgchange -an ${LVMVD_VOLUME_GROUP_NAME} - losetup -d ${LVMVD_LOOP_DEVICE} -} - -# Create physical volume based on loop device (in case it does not exist) -# -create_volume() { - # only do this if the file which holds the logcial volumes - # does not exist - if [ ! -f ${LVMVD_PV_SPARSE_FILE} ]; then - truncate -s ${LVMVD_PV_SIZE}g ${LVMVD_PV_SPARSE_FILE} - create_loop - pvcreate ${LVMVD_LOOP_DEVICE} - vgcreate ${LVMVD_VOLUME_GROUP_NAME} ${LVMVD_LOOP_DEVICE} - #delete_loop - retry_delete_loop - fi -} - -case $1 in - - start) - pid_guard ${LVMVD_PID_FILE} ${JOB_NAME} - - # Install debian packages - - # We install the debian packages while starting the process and not during the - # packaging phase because during the installation of the packages some necessary - # prerequesits are done we do not want to reimplement in the bosh release. - # DON'T CHANGE THE ORDER OF THE PACKAGE NAMES - - LVM2_PACKAGE_PATH=/var/vcap/packages/lvm2 - set +e - if [[ `lsb_release -cs` == "xenial" ]]; then - - echo "$(date) Installing Xenial packages for lvm2" - - if ! dpkg -s libdevmapper-event1.02.1 > /dev/null 2>&1 ; then - echo "$(date) Installing debian package libdevmapper-event1.02.1" - set -e - dpkg -i $LVM2_PACKAGE_PATH/libdevmapper-event1.02.1_2_1.02.110-1ubuntu10_amd64.deb - set +e - fi - - # the package liblvm2cmd2.02 and dmeventd (package in below if) have cyclic dependency - # just unpack the packages and configure them after unpacking both packages - if ! dpkg -s liblvm2cmd2.02 > /dev/null 2>&1 ; then - echo "$(date) Installing debian package liblvm2cmd2.02" - set -e - dpkg --unpack $LVM2_PACKAGE_PATH/liblvm2cmd2.02_2.02.133-1ubuntu10_amd64.deb - set +e - fi - - if ! dpkg -s dmeventd > /dev/null 2>&1 ; then - echo "$(date) Installing debian package dmeventd" - set -e - dpkg --unpack $LVM2_PACKAGE_PATH/dmeventd_2_1.02.110-1ubuntu10_amd64.deb - - # Now configure both liblvm2cmd2.02 and dmeventd which have cyclic dependency - dpkg --configure liblvm2cmd2.02 dmeventd - set +e - fi - - if ! dpkg -s liblvm2app2.2 > /dev/null 2>&1 ; then - echo "$(date) Installing debian package liblvm2app2.2" - set -e - dpkg -i $LVM2_PACKAGE_PATH/liblvm2app2.2_2.02.133-1ubuntu10_amd64.deb - set +e - fi - - if ! dpkg -s lvm2 > /dev/null 2>&1 ; then - echo "$(date) Installing debian package lvm2" - set -e - dpkg -i $LVM2_PACKAGE_PATH/lvm2_2.02.133-1ubuntu10_amd64.deb - set +e - - fi - - #lvmetad is new caching mechanism in lvm2, observed few problems with it hence disabling - /etc/init.d/lvm2 stop - sed -i 's/use_lvmetad = 1/use_lvmetad = 0/g' /etc/lvm/lvm.conf - /etc/init.d/lvm2 start - - elif [[ `lsb_release -cs` == "bionic" ]]; then - - echo "$(date) Installing bionic packages for lvm2" - - if ! dpkg -s libdevmapper-event1.02.1 > /dev/null 2>&1 ; then - echo "$(date) Installing debian package libdevmapper-event1.02.1" - set -e - dpkg -i $LVM2_PACKAGE_PATH/libdevmapper-event1.02.1_1.02.145-4.1ubuntu3_amd64.deb - set +e - fi - - # the package liblvm2cmd2.02 and dmeventd (package in below if) have cyclic dependency - # just unpack the packages and configure them after unpacking both packages - if ! dpkg -s liblvm2cmd2.02 > /dev/null 2>&1 ; then - echo "$(date) Installing debian package liblvm2cmd2.02" - set -e - dpkg --unpack $LVM2_PACKAGE_PATH/liblvm2cmd2.02_2.02.176-4.1ubuntu3_amd64.deb - set +e - fi - - if ! dpkg -s dmeventd > /dev/null 2>&1 ; then - echo "$(date) Installing debian package dmeventd" - set -e - dpkg --unpack $LVM2_PACKAGE_PATH/dmeventd_1.02.145-4.1ubuntu3_amd64.deb - - # Now configure both liblvm2cmd2.02 and dmeventd which have cyclic dependency - dpkg --configure liblvm2cmd2.02 dmeventd - set +e - fi - - if ! dpkg -s liblvm2app2.2 > /dev/null 2>&1 ; then - echo "$(date) Installing debian package liblvm2app2.2" - set -e - dpkg -i $LVM2_PACKAGE_PATH/liblvm2app2.2_2.02.176-4.1ubuntu3_amd64.deb - set +e - fi - - if ! dpkg -s lvm2 > /dev/null 2>&1 ; then - echo "$(date) Installing debian package lvm2" - set -e - dpkg -i $LVM2_PACKAGE_PATH/lvm2_2.02.176-4.1ubuntu3_amd64.deb - set +e - - fi - - #lvmetad is new caching mechanism in lvm2, observed few problems with it hence disabling - /etc/init.d/lvm2 stop - sed -i 's/use_lvmetad = 1/use_lvmetad = 0/g' /etc/lvm/lvm.conf - /etc/init.d/lvm2 start - - elif [[ `lsb_release -cs` == "trusty" ]]; then - - echo "$(date) Installing Trusty packages for lvm2" - - for package in libdevmapper-event1.02.1 watershed lvm2 - do - - # check if package already installed else install, incase package not found - # using dpkg -s for checking the installation which does not lock the /var/lib/dpkg/lock - - if ! dpkg -s $package > /dev/null 2>&1 ; then - echo "$(date) Installing debian package $package" - set -e - dpkg -i "$(ls -1 $LVM2_PACKAGE_PATH/${package}_*.deb | head -1)" - set +e - fi - done - - elif [[ `lsb_release -cs` == "jammy" ]]; then - - echo "$(date) Installing jammy packages for lvm2" - - if ! dpkg -s libdevmapper-event1.02.1 > /dev/null 2>&1 ; then - echo "$(date) Installing debian package libdevmapper-event1.02.1" - set -e - dpkg -i $LVM2_PACKAGE_PATH/libdevmapper-event1.02.1_1.02.175-2.1ubuntu4_amd64.deb - set +e - fi - - # the package liblvm2cmd2.03 and dmeventd (package in below if) have cyclic dependency - # just unpack the packages and configure them after unpacking both packages - if ! dpkg -s dmeventd > /dev/null 2>&1 ; then - echo "$(date) Installing debian package dmeventd" - set -e - dpkg --unpack $LVM2_PACKAGE_PATH/dmeventd_1.02.175-2.1ubuntu4_amd64.deb - set +e - fi - - if ! dpkg -s liblvm2cmd2.03 > /dev/null 2>&1 ; then - echo "$(date) Installing debian package liblvm2cmd2.03" - set -e - dpkg --unpack $LVM2_PACKAGE_PATH/liblvm2cmd2.03_2.03.11-2.1ubuntu4_amd64.deb - # Now configure both liblvm2cmd2.03 and dmeventd which have cyclic dependency - dpkg --configure dmeventd liblvm2cmd2.03 - set +e - fi - - if ! dpkg -s thin-provisioning-tools > /dev/null 2>&1 ; then - echo "$(date) Installing debian package thin-provisioning-tools" - set -e - dpkg -i $LVM2_PACKAGE_PATH/thin-provisioning-tools_0.9.0-2ubuntu1_amd64.deb - fi - - if ! dpkg -s lvm2 > /dev/null 2>&1 ; then - echo "$(date) Installing debian package lvm2" - set -e - dpkg -i $LVM2_PACKAGE_PATH/lvm2_2.03.11-2.1ubuntu4_amd64.deb - set +e - - fi - - #lvmetad is new caching mechanism in lvm2, observed few problems with it hence disabling - # /etc/init.d/lvm2 stop - # sed -i 's/use_lvmetad = 1/use_lvmetad = 0/g' /etc/lvm/lvm.conf - # /etc/init.d/lvm2 start - - else - echo "$(date) Unsupported ubuntu release" - exit 1 - fi - set -e - - # To disable lvm archive - sed -i 's/archive = 1/archive = 0/g' /etc/lvm/lvm.conf - - create_volume - create_loop - - echo $$ > ${LVMVD_PID_FILE} - - exec /var/vcap/packages/lvmvd/bin/lvmvd \ - --default-size ${LVMVD_DEFAULT_SIZE} \ - --mount-root ${LVMVD_MOUNT_DIR} \ - --volume-group-name ${LVMVD_VOLUME_GROUP_NAME} \ - --sock-file ${LVMVD_SOCKET_FILE} \ - >>${LVMVD_LOG_DIR}/${OUTPUT_LABEL}.stdout.log \ - 2>>${LVMVD_LOG_DIR}/${OUTPUT_LABEL}.stderr.log - ;; - - stop) - set +e - # Stop Swarm Manager daemon - kill_and_wait ${LVMVD_PID_FILE} - #delete_loop - retry_delete_loop - - #kill any process using the mounted volume - kill -9 $(lsof -t $DOCKER_VOLUME_MOUNTDIR) - sleep 2s - - set -e - ;; - - *) - echo "Usage: $0 {start|stop}" - exit 1 - ;; - -esac -exit 0 - diff --git a/jobs/docker/templates/bin/post-start.erb b/jobs/docker/templates/bin/post-start.erb deleted file mode 100755 index 3df2b0f59..000000000 --- a/jobs/docker/templates/bin/post-start.erb +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -set -e - -DOCKER_DAEMON_KEY_FILE_ARG=<%= p('docker.daemon.keyfile') %> -if [[ ! -f "${DOCKER_DAEMON_KEY_FILE_ARG}" ]] && [[ -f /etc/docker/key.json ]] ; then - touch "${DOCKER_DAEMON_KEY_FILE_ARG}" - cp /etc/docker/key.json "${DOCKER_DAEMON_KEY_FILE_ARG}" -fi \ No newline at end of file diff --git a/jobs/docker/templates/config/docker-logrotate.erb b/jobs/docker/templates/config/docker-logrotate.erb deleted file mode 100644 index 26d2b5357..000000000 --- a/jobs/docker/templates/config/docker-logrotate.erb +++ /dev/null @@ -1,9 +0,0 @@ -/var/vcap/store/docker/docker/containers/*/*.log { - rotate <%= p('docker.logrotate.count') %><% if_p('docker.logrotate.interval') do |interval| %> - <%= interval %><% end %> - compress - size=<%= p('docker.logrotate.size') %> - missingok - delaycompress - copytruncate -} diff --git a/jobs/docker/templates/config/docker.cacert.erb b/jobs/docker/templates/config/docker.cacert.erb deleted file mode 100644 index 2df09e6a9..000000000 --- a/jobs/docker/templates/config/docker.cacert.erb +++ /dev/null @@ -1 +0,0 @@ -<% if_p('common.tls_cacert') do |cert| %><% if cert.index("\n").nil? %><%= cert.gsub('\\n', "\n") %><% else %><%= cert %><% end %><% end %> diff --git a/jobs/docker/templates/config/docker.cert.erb b/jobs/docker/templates/config/docker.cert.erb deleted file mode 100644 index 7c391b510..000000000 --- a/jobs/docker/templates/config/docker.cert.erb +++ /dev/null @@ -1 +0,0 @@ -<% if_p('docker.tls_cert') do |cert| %><% if cert.index("\n").nil? %><%= cert.gsub('\\n', "\n") %><% else %><%= cert %><% end %><% end %> \ No newline at end of file diff --git a/jobs/docker/templates/config/docker.key.erb b/jobs/docker/templates/config/docker.key.erb deleted file mode 100644 index 6d12129db..000000000 --- a/jobs/docker/templates/config/docker.key.erb +++ /dev/null @@ -1 +0,0 @@ -<% if_p('docker.tls_key') do |cert| %><% if cert.index("\n").nil? %><%= cert.gsub('\\n', "\n") %><% else %><%= cert %><% end %><% end %> \ No newline at end of file diff --git a/jobs/service-fabrik-admin-app/templates/config/settings.yml.erb b/jobs/service-fabrik-admin-app/templates/config/settings.yml.erb index e9bdd995b..375e5f262 100644 --- a/jobs/service-fabrik-admin-app/templates/config/settings.yml.erb +++ b/jobs/service-fabrik-admin-app/templates/config/settings.yml.erb @@ -270,18 +270,6 @@ production: identity_provider: <%= identity_provider %> <% end %> - ################### - # DOCKER SETTINGS # - ################### - docker: - url: <%= link("broker").p('docker.url') %> - allocate_docker_host_ports: <%= link("broker").p('docker.allocate_docker_host_ports') %> - volume_driver: <%= link("broker").p('docker.volume_driver') %> - ssl: - ca: <%= JSON.dump(link("broker").p('common.tls_cacert')) %> - cert: <%= JSON.dump(link("broker").p('common.tls_client_cert')) %> - key: <%= JSON.dump(link("broker").p('common.tls_client_key')) %> - service_addon_jobs: <%= link("broker").p('service_addon_jobs') %> ##################### diff --git a/jobs/service-fabrik-backup-manager/templates/config/settings.yml.erb b/jobs/service-fabrik-backup-manager/templates/config/settings.yml.erb index 1dbcc0574..1d9a0ede0 100644 --- a/jobs/service-fabrik-backup-manager/templates/config/settings.yml.erb +++ b/jobs/service-fabrik-backup-manager/templates/config/settings.yml.erb @@ -163,17 +163,6 @@ production: identity_provider: <%= identity_provider %> <% end %> - ################### - # DOCKER SETTINGS # - ################### - docker: - url: <%= link("broker").p('docker.url') %> - allocate_docker_host_ports: <%= link("broker").p('docker.allocate_docker_host_ports') %> - volume_driver: <%= link("broker").p('docker.volume_driver') %> - ssl: - ca: <%= JSON.dump(link("broker").p('common.tls_cacert')) %> - cert: <%= JSON.dump(link("broker").p('common.tls_client_cert')) %> - key: <%= JSON.dump(link("broker").p('common.tls_client_key')) %> ##################### # DIRECTOR SETTINGS # ##################### diff --git a/jobs/service-fabrik-bosh-manager/templates/config/settings.yml.erb b/jobs/service-fabrik-bosh-manager/templates/config/settings.yml.erb index 07d6e7a0c..0ecc82eb1 100644 --- a/jobs/service-fabrik-bosh-manager/templates/config/settings.yml.erb +++ b/jobs/service-fabrik-bosh-manager/templates/config/settings.yml.erb @@ -243,18 +243,6 @@ production: identity_provider: <%= identity_provider %> <% end %> - ################### - # DOCKER SETTINGS # - ################### - docker: - url: <%= link("broker").p('docker.url') %> - allocate_docker_host_ports: <%= link("broker").p('docker.allocate_docker_host_ports') %> - volume_driver: <%= link("broker").p('docker.volume_driver') %> - ssl: - ca: <%= JSON.dump(link("broker").p('common.tls_cacert')) %> - cert: <%= JSON.dump(link("broker").p('common.tls_client_cert')) %> - key: <%= JSON.dump(link("broker").p('common.tls_client_key')) %> - service_addon_jobs: <%= link("broker").p('service_addon_jobs') %> ##################### diff --git a/jobs/service-fabrik-broker-ext/templates/config/settings.yml.erb b/jobs/service-fabrik-broker-ext/templates/config/settings.yml.erb index 496293b5a..b4e782c48 100644 --- a/jobs/service-fabrik-broker-ext/templates/config/settings.yml.erb +++ b/jobs/service-fabrik-broker-ext/templates/config/settings.yml.erb @@ -270,18 +270,6 @@ production: identity_provider: <%= identity_provider %> <% end %> - ################### - # DOCKER SETTINGS # - ################### - docker: - url: <%= link("broker").p('docker.url') %> - allocate_docker_host_ports: <%= link("broker").p('docker.allocate_docker_host_ports') %> - volume_driver: <%= link("broker").p('docker.volume_driver') %> - ssl: - ca: <%= JSON.dump(link("broker").p('common.tls_cacert')) %> - cert: <%= JSON.dump(link("broker").p('common.tls_client_cert')) %> - key: <%= JSON.dump(link("broker").p('common.tls_client_key')) %> - service_addon_jobs: <%= link("broker").p('service_addon_jobs') %> ##################### diff --git a/jobs/service-fabrik-broker/spec b/jobs/service-fabrik-broker/spec index 4006870fc..4920cfb1d 100644 --- a/jobs/service-fabrik-broker/spec +++ b/jobs/service-fabrik-broker/spec @@ -91,10 +91,10 @@ provides: - backup.restore_history_days - backup.reschedule_backup_delay_after_restore - backup.transaction_logs_delete_buffer_time - - docker.url - - docker.skip_ssl_validation - - docker.allocate_docker_host_ports - - docker.volume_driver + # - docker.url + # - docker.skip_ssl_validation + # - docker.allocate_docker_host_ports + # - docker.volume_driver - common.tls_cacert - common.tls_client_cert - common.tls_client_key @@ -335,21 +335,21 @@ properties: cf.identity_provider: description: "Identity provider for the Cloud Foundry cloud controller" - docker.job: - description: "Name of the swarm/docker job" - default: "swarm_manager" - docker.url: - description: "Docker URL (HTTP address or Unix socket)" - default: "https://10.11.252.10:2376" - docker.allocate_docker_host_ports: - description: "Allocate Docker host ports when creating a container" - default: true - docker.volume_driver: - description: "Volume driver used for Docker containers (only local or lvm-volume-driver are currently supported)" - default: "local" - docker.skip_ssl_validation: - description: "Determines whether the broker should verify SSL certificates when communicating with the Swarm Manager" - default: true + # docker.job: + # description: "Name of the swarm/docker job" + # default: "swarm_manager" + # docker.url: + # description: "Docker URL (HTTP address or Unix socket)" + # default: "https://10.11.252.10:2376" + # docker.allocate_docker_host_ports: + # description: "Allocate Docker host ports when creating a container" + # default: true + # docker.volume_driver: + # description: "Volume driver used for Docker containers (only local or lvm-volume-driver are currently supported)" + # default: "local" + # docker.skip_ssl_validation: + # description: "Determines whether the broker should verify SSL certificates when communicating with the Swarm Manager" + # default: true common.tls_cacert: description: "Trust only remotes providing a certificate signed by the CA given here" common.tls_client_cert: diff --git a/jobs/service-fabrik-broker/templates/bin/job_properties.sh.erb b/jobs/service-fabrik-broker/templates/bin/job_properties.sh.erb index a57f182df..952cef253 100644 --- a/jobs/service-fabrik-broker/templates/bin/job_properties.sh.erb +++ b/jobs/service-fabrik-broker/templates/bin/job_properties.sh.erb @@ -25,5 +25,5 @@ export JQ_CMD=/var/vcap/packages/jq/bin/jq # TLS enabled to contact swarm export DOCKER_TLS_VERIFY=1 -# TLS certificate path to contact docker swarm manager -export DOCKER_CERT_PATH=$CONF_DIR +# # TLS certificate path to contact docker swarm manager +# export DOCKER_CERT_PATH=$CONF_DIR diff --git a/jobs/service-fabrik-broker/templates/config/settings.yml.erb b/jobs/service-fabrik-broker/templates/config/settings.yml.erb index 133b9f044..7dab91a05 100644 --- a/jobs/service-fabrik-broker/templates/config/settings.yml.erb +++ b/jobs/service-fabrik-broker/templates/config/settings.yml.erb @@ -220,18 +220,6 @@ production: identity_provider: <%= identity_provider %> <% end %> - ################### - # DOCKER SETTINGS # - ################### - docker: - url: <%= p('docker.url') %> - allocate_docker_host_ports: <%= p('docker.allocate_docker_host_ports') %> - volume_driver: <%= p('docker.volume_driver') %> - ssl: - ca: <%= JSON.dump(p('common.tls_cacert')) %> - cert: <%= JSON.dump(p('common.tls_client_cert')) %> - key: <%= JSON.dump(p('common.tls_client_key')) %> - service_addon_jobs: <%= p('service_addon_jobs') %> ##################### diff --git a/jobs/service-fabrik-docker-manager/monit b/jobs/service-fabrik-docker-manager/monit deleted file mode 100644 index 5ddceafbf..000000000 --- a/jobs/service-fabrik-docker-manager/monit +++ /dev/null @@ -1,5 +0,0 @@ -check process service-fabrik-docker-manager with pidfile /var/vcap/sys/run/service-fabrik-docker-manager/service-fabrik-docker-manager.pid - group vcap - depends on service-fabrik-apiserver - start program "/var/vcap/packages/bosh-helpers/monit_debugger service-fabrik-docker-manager_ctl '/var/vcap/jobs/service-fabrik-docker-manager/bin/service-fabrik-docker-manager_ctl start'" - stop program "/var/vcap/packages/bosh-helpers/monit_debugger service-fabrik-docker-manager_ctl '/var/vcap/jobs/service-fabrik-docker-manager/bin/service-fabrik-docker-manager_ctl stop'" diff --git a/jobs/service-fabrik-docker-manager/spec b/jobs/service-fabrik-docker-manager/spec deleted file mode 100644 index db0aa7849..000000000 --- a/jobs/service-fabrik-docker-manager/spec +++ /dev/null @@ -1,22 +0,0 @@ ---- -name: service-fabrik-docker-manager - -packages: - - bosh-helpers - - node - - service-fabrik-broker - -templates: - bin/service-fabrik-docker-manager_ctl.erb: bin/service-fabrik-docker-manager_ctl - bin/job_properties.sh.erb: bin/job_properties.sh - config/settings.yml.erb: config/settings.yml - -consumes: -- name: broker - type: broker -- name: scheduler - type: scheduler -- name: deployment_hooks - type: deployment_hooks -- name: service-fabrik-apiserver - type: service-fabrik-apiserver diff --git a/jobs/service-fabrik-docker-manager/templates/bin/job_properties.sh.erb b/jobs/service-fabrik-docker-manager/templates/bin/job_properties.sh.erb deleted file mode 100644 index dfd2be56c..000000000 --- a/jobs/service-fabrik-docker-manager/templates/bin/job_properties.sh.erb +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash -# -# Service-Fabrik-Docker-Manager properties -# -# Directory to store the configuration files -export CONF_DIR=$JOB_DIR/config - -# Node environment -export NODE_ENV=production - -# configuration file location -export SETTINGS_PATH=$CONF_DIR/settings.yml - -# Node binary -export NODE_CMD=/var/vcap/packages/node/bin/node - -#Yaml2json binary -export YAML2JSON_CMD=/var/vcap/packages/yaml2json/bin/yaml2json - -#jq binary -export JQ_CMD=/var/vcap/packages/jq/bin/jq - -# TLS enabled to contact swarm -export DOCKER_TLS_VERIFY=1 - -# TLS certificate path to contact docker swarm manager -export DOCKER_CERT_PATH=$CONF_DIR diff --git a/jobs/service-fabrik-docker-manager/templates/bin/service-fabrik-docker-manager_ctl.erb b/jobs/service-fabrik-docker-manager/templates/bin/service-fabrik-docker-manager_ctl.erb deleted file mode 100644 index 486f3b5a5..000000000 --- a/jobs/service-fabrik-docker-manager/templates/bin/service-fabrik-docker-manager_ctl.erb +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/bash - -set -e # exit immediately if a simple command exits with a non-zero status - -source /var/vcap/packages/bosh-helpers/ctl_setup.sh 'service-fabrik-docker-manager' - -export PID_FILE=${RUN_DIR}/service-fabrik-docker-manager.pid -export PACKAGE_DIR=${HOME}/packages/service-fabrik-broker - -case $1 in - - start) - pid_guard ${PID_FILE} ${JOB_NAME} - - # Set limitations on system resources - ulimit -c unlimited - ulimit -v unlimited - - # Start Service Fabrik docker Manager - start-stop-daemon --start --quiet -m \ - --pidfile ${PID_FILE} \ - --startas ${NODE_CMD} \ - --chuid vcap:vcap \ - --background \ - --no-close \ - --chdir ${PACKAGE_DIR} \ - -- ${PACKAGE_DIR}/broker/applications/operators/src/StartDockerOperators.js \ - 1>> ${LOG_DIR}/${OUTPUT_LABEL}.stdout.log \ - 2>> ${LOG_DIR}/${OUTPUT_LABEL}.stderr.log - ;; - - - stop) - # Stop Service Fabrik Monitoring Agent daemon - kill_and_wait ${PID_FILE} - ;; - - *) - echo "Usage: $0 {start|stop}" - exit 1 - ;; - -esac -exit 0 diff --git a/jobs/service-fabrik-docker-manager/templates/config/settings.yml.erb b/jobs/service-fabrik-docker-manager/templates/config/settings.yml.erb deleted file mode 100644 index 3651369bd..000000000 --- a/jobs/service-fabrik-docker-manager/templates/config/settings.yml.erb +++ /dev/null @@ -1,268 +0,0 @@ -<% - def ostruct_to_hash(os) - os.marshal_dump.map do |key, value| - { key => value.is_a?(OpenStruct) ? ostruct_to_hash(value) : value } - end.reduce(&:merge) - end - - broker_name = link("broker").p('name') - log_path = "/var/vcap/sys/log/service-fabrik-docker-manager/service-fabrik-docker-manager.log" - external = link("broker").p('external') - internal = link("broker").p('internal') -%>--- -production: - #################### - # GENERAL SETTINGS # - #################### - broker_name: '<%= broker_name %>' - deployment_name: '<%= spec.deployment %>' - release_name: '<%= spec.release.name %>' - release_version: '<%= spec.release.version %>' - username: '<%= link("broker").p('username') %>' - password: '<%= link("broker").p('password') %>' - broker_ip: <%= spec.ip %> - enable_service_fabrik_v2: <%= link("broker").p('enable_service_fabrik_v2') %> - skip_ssl_validation: <%= link("broker").p('skip_ssl_validation') %> - session_store: - path: <%= "/var/vcap/store/#{broker_name}/session" %> - log_path: <%= log_path %> - log_level: <%= link("broker").p('log_level') %> - sys_log_level: <%= link("broker").p('sys_log_level') %> - enable_bosh_rate_limit: <%= link("broker").p('enable_bosh_rate_limit') %> - enable_circuit_breaker: <%= link("broker").p('enable_circuit_breaker') %> - enable_swarm_manager: <%= link("broker").p('enable_swarm_manager') %> - feature: - ServiceInstanceAutoUpdate: <%= link("broker").p('feature.ServiceInstanceAutoUpdate') %> - EnableSecurityGroupsOps: <%= link("broker").p('feature.EnableSecurityGroupsOps') %> - http_timeout: <%= link("broker").p('http_timeout') %> - deployment_action_timeout: <%= link("broker").p('deployment_action_timeout') %> - multi_az_enabled: <%= link("broker").p('multi_az_enabled') %> - ha_enabled: <%= link("broker").p('ha_enabled') %> - broker_drain_message: <%= link("broker").p('broker_drain_message') %> - ############################## - # EXTERNAL ENDPOINT SETTINGS # - ############################## - external: - log_event: <%= link("broker").p('external.log_event') %> - event_type: SF.API_EVENT - trust_proxy: <%= external['trust_proxy'] %> - port: <%= external['port'] %> - <% link("broker").if_p('external.ssl') do |ssl| %> - protocol: 'https' - ssl: <%= JSON.dump(ssl) %> - <% end.else do %> - protocol: 'https' - <% end %> - host: <%= external['host'] %> - cookie_secret: <%= external['cookie_secret'] %> - cookie_secure: true - session_expiry: <%= external['session_expiry'] %> - api_requires_admin_scope: <%= link("broker").p('external.api_requires_admin_scope', false) %> - - ############################## - # INTERNAL ENDPOINT SETTINGS # - ############################## - internal: - log_event: <%= link("broker").p('internal.log_event') %> - event_type: SF.BROKER_EVENT - domain_socket: - path: <%= link("broker").p('internal.domain_socket.path') %> - fwd_events: true - port: <%= internal['port'] %> - ip: <%= internal['ip'] %> - host: <%= "#{internal['ip']}:#{internal['port']}" %> - <% link("broker").if_p('internal.ssl') do |ssl| %> - protocol: 'https' - ssl: <%= JSON.dump(ssl) %> - <% end.else do %> - protocol: 'http' - <% end %> - ############################## - # APISERVER SETTINGS # - ############################## - apiserver: - ip: <%= link("service-fabrik-apiserver").p('ip') %> - port: <%= link("service-fabrik-apiserver").p('port') %> - ca: <%= JSON.dump(link("service-fabrik-apiserver").p('tls.apiserver.ca')) %> - certificate: <%= JSON.dump(link("service-fabrik-apiserver").p('tls.apiserver.certificate')) %> - private_key: <%= JSON.dump(link("service-fabrik-apiserver").p('tls.apiserver.private_key')) %> - crds: <%= JSON.dump(link("service-fabrik-apiserver").p('crds')) %> - getConfigInCluster: false - pathToKubeConfig: "/var/vcap/jobs/service-fabrik-apiserver/config/kubeconfig" - - ############################# - # DEPLOYMENT HOOKS SETTINGS # - ############################# - deployment_hooks: - username: '<%= link("deployment_hooks").p('username') %>' - password: '<%= link("deployment_hooks").p('password') %>' - host: <%= "#{link("deployment_hooks").p('hook.ip')}:#{link("deployment_hooks").p('hook.port')}"%> - protocol: '<%= link("deployment_hooks").p('hook.protocol')%>' - - #################### - # MONGODB SETTINGS # - #################### - mongodb: - <% link("broker").if_p('mongodb.url') do |mongodb_url| %> - url: <%= mongodb_url %> - <% end %> - <% link("broker").if_p('mongodb.provision.plan_id') do |mongodb_plan_id| %> - provision: - plan_id: <%= mongodb_plan_id %> - network_index: <%= link("broker").p('mongodb.provision.network_index') %> - <% end %> - # Choice of integrating mongodb is either via an already provisioned mongo instance by specifying the URL OR - # by specifying the plan id from service catalog, which fabrik will provision automatically and start using - deployment_name: <%= link("broker").p('mongodb.deployment_name') %> - retry_connect: - max_attempt: <%= link("broker").p('mongodb.retry_connect.max_attempt') %> - min_delay: <%= link("broker").p('mongodb.retry_connect.min_delay') %> - record_max_fetch_count: <%= link("broker").p('mongodb.record_max_fetch_count') %> # Max number of records that can be fetched at a time - backup: - schedule_interval: <%= link("broker").p('mongodb.backup.schedule_interval') %> - agent: - provider: - container: <%= link("broker").p('mongodb.agent.provider.container') %> - - - ###################### - # SCHEDULER SETTINGS # - ###################### - scheduler: - <% link("scheduler").if_p('job_types') do |job_types| %> - job_types: <%= job_types %> # Comma seperated list of batch job types that are enabled in service fabrik - <% end %> - process_every: <%= link("scheduler").p('process_every') %> # Interval at which scheduler will query the database looking for jobs that need to be processed - run_with_web_process: <%= link("scheduler").p('run_with_web_process') %> # Flag which indicates if scheduler can run in the same process as that of service fabrik broker web process - max_concurrency: <%= link("scheduler").p('max_concurrency') %> # A number which specifies the max number of batch jobs that can be running at any given moment - default_concurrency: <%= link("scheduler").p('default_concurrency') %> # A number which specifies the default number of a specific job that can be running at any given moment - start_delay: <%= link("scheduler").p('start_delay') %> - default_lock_lifetime: <%= link("scheduler").p('default_lock_lifetime') %> # Specifies the default lock lifetime of a batchjob in milliseconds. - agenda_collection: <%= link("scheduler").p('agenda_collection') %> # Name of the collection in mongodb which is to be used by agendaJS to store the scheduled job meta info - maintenance_check_interval: <%= link("scheduler").p('maintenance_check_interval') %> - maintenance_mode_time_out: <%= link("scheduler").p('maintenance_mode_time_out') %> - downtime_maintenance_phases: <%= link("scheduler").p('downtime_maintenance_phases') %> - jobs: - reschedule_delay: <%= link("scheduler").p('jobs.reschedule_delay') %> - scheduled_backup: - max_attempts: <%= link("scheduler").p('jobs.scheduled_backup.max_attempts') %> - service_instance_update: - max_attempts: <%= link("scheduler").p('jobs.service_instance_update.max_attempts') %> - run_every_xdays: <%= link("scheduler").p('jobs.service_instance_update.run_every_xdays') %> - should_start_after_hr: <%= link("scheduler").p('jobs.service_instance_update.should_start_after_hr') %> - should_start_before_hr: <%= link("scheduler").p('jobs.service_instance_update.should_start_before_hr') %> - should_start_after_min: <%= link("scheduler").p('jobs.service_instance_update.should_start_after_min') %> - should_start_before_min: <%= link("scheduler").p('jobs.service_instance_update.should_start_before_min') %> - time_zone: <%= link("scheduler").p('jobs.service_instance_update.time_zone') %> - system_jobs: - - name: 'service-fabrik-mongodb' - type: 'ScheduledOobDeploymentBackup' - interval: <%= link("broker").p('mongodb.backup.schedule_interval') %> #Backup schedule interval for service fabrik DB - job_data: - type: 'online' - trigger: 'scheduled' - deployment_name: <%= link("broker").p('mongodb.deployment_name') %> - container: <%= link("broker").p('mongodb.agent.provider.container') %> - - name: 'Backup_Reaper' - type: 'BackupReaper' - interval: <%= link("scheduler").p('system_jobs.backup_reaper.interval') %> #Schedule interval for backup reaper job - job_data: - delete_delay: <%= link("scheduler").p('system_jobs.backup_reaper.job_data.delete_delay') %> - - name: 'DbCollection_Reaper' - type: 'DbCollectionReaper' - interval: <%= link("scheduler").p('system_jobs.dbcollection_reaper.interval') %> #Schedule interval for DB Collection reaper job - job_data: - reap_collections: - - name : JobRunDetail - retention_in_days: <%= link("scheduler").p('system_jobs.dbcollection_reaper.jobrun_detail.retention_in_days') %> - - name : EventDetail - retention_in_days: <%= link("scheduler").p('system_jobs.dbcollection_reaper.event_detail.retention_in_days') %> - enabled: true - - ####################### - # MONITORING SETTINGS # - ####################### - monitoring: - success_state: 'ok' - success_metric: 0 - failure_state: 'critical' - failure_metric: 1 - warning_state: 'warning' - inprogress_state: 'in progress' - inprogress_metric: 2 - event_name_prefix: <%= link("broker").p('riemann.prefix') %>.<%= name %>.<%= index %>.<%= spec.deployment %> - include_response_body: <%= link("broker").p('monitoring.include_response_body') %> - events_logged_in_db: <%= link("broker").p('monitoring.events_logged_in_db') %> - unauthorized: - http_status: [401,403] - event_name: 'unauthorized_access' - description: 'Unauthorized access to service attempted' - tags: ['security', 'unauthorized'] - include_response_body: <%= link("broker").p('monitoring.unauthorized.include_response_body') %> - riemann: - enabled: <%= link("broker").p('riemann.enabled') %> - host: <%= link("broker").p('riemann.host') %> - port: <%= link("broker").p('riemann.port') %> - protocol : tcp - show_errors: <%= link("broker").p('riemann.show_errors') %> - prefix: <%= link("broker").p('riemann.prefix') %> - log_additional_event: <%= link("broker").p('riemann.log_additional_event') %> - http_status_codes_to_be_skipped: <% link("broker").p('riemann.http_status_codes_to_be_skipped').each do |code| %> - - <%= code %><% end %> - - ################### - # QUOTA MANAGEMENT SETTINGS # - ################### - quota: <%= JSON.dump(link("broker").p('quota', nil)) %> - - ################### - # BACKUP SETTINGS # - ################### - backup: - retention_period_in_days: <%= link("broker").p('backup.retention_period_in_days') %> - max_num_on_demand_backup: <%= link("broker").p('backup.max_num_on_demand_backup') %> - status_check_every: <%= link("broker").p('backup.status_check_every') %> - retry_delay_on_error: <%= link("broker").p('backup.retry_delay_on_error') %> - lock_check_delay_on_restart: <%= link("broker").p('backup.lock_check_delay_on_restart') %> - backup_restore_status_poller_timeout: <%= link("broker").p('backup.backup_restore_status_poller_timeout') %> - backup_restore_status_check_every: <%= link("broker").p('backup.backup_restore_status_check_every') %> - abort_time_out: <%= link("broker").p('backup.abort_time_out') %> - consecutive_backup_failure_sla_count: <%= link("broker").p('backup.consecutive_backup_failure_sla_count') %> - num_of_allowed_restores: <%= link("broker").p('backup.num_of_allowed_restores') %> - restore_history_days: <%= link("broker").p('backup.restore_history_days') %> - reschedule_backup_delay_after_restore: <%= link("broker").p('backup.reschedule_backup_delay_after_restore') %> - provider: <%= JSON.dump(link("broker").p('backup.provider', nil)) %> - - ######################### - # CLOUDFOUNDRY SETTINGS # - ######################### - cf: - url: <%= link("broker").p('cf.url') %> - username: <%= link("broker").p('cf.username') %> - password: <%= link("broker").p('cf.password') %> - <% link("broker").if_p('cf.identity_provider') do |identity_provider| %> - identity_provider: <%= identity_provider %> - <% end %> - - ################### - # DOCKER SETTINGS # - ################### - docker: - url: <%= link("broker").p('docker.url') %> - allocate_docker_host_ports: <%= link("broker").p('docker.allocate_docker_host_ports') %> - volume_driver: <%= link("broker").p('docker.volume_driver') %> - ssl: - ca: <%= JSON.dump(link("broker").p('common.tls_cacert')) %> - cert: <%= JSON.dump(link("broker").p('common.tls_client_cert')) %> - key: <%= JSON.dump(link("broker").p('common.tls_client_key')) %> - - service_addon_jobs: <%= link("broker").p('service_addon_jobs') %> - - ##################### - # DIRECTOR SETTINGS # - ##################### - directors: <%= JSON.dump(link("broker").p('directors')) %> - #################### - # SERVICES CATALOG # - #################### - services: <%= JSON.pretty_generate(link("broker").p('services')) %> diff --git a/jobs/service-fabrik-quota-app/templates/config/settings.yml.erb b/jobs/service-fabrik-quota-app/templates/config/settings.yml.erb index 9477036e4..e12ca4f3a 100644 --- a/jobs/service-fabrik-quota-app/templates/config/settings.yml.erb +++ b/jobs/service-fabrik-quota-app/templates/config/settings.yml.erb @@ -80,18 +80,6 @@ production: identity_provider: <%= identity_provider %> <% end %> - ################### - # DOCKER SETTINGS # - ################### - docker: - url: <%= link("broker").p('docker.url') %> - allocate_docker_host_ports: <%= link("broker").p('docker.allocate_docker_host_ports') %> - volume_driver: <%= link("broker").p('docker.volume_driver') %> - ssl: - ca: <%= JSON.dump(link("broker").p('common.tls_cacert')) %> - cert: <%= JSON.dump(link("broker").p('common.tls_client_cert')) %> - key: <%= JSON.dump(link("broker").p('common.tls_client_key')) %> - service_addon_jobs: <%= link("broker").p('service_addon_jobs') %> ##################### diff --git a/jobs/service-fabrik-report/templates/config/settings.yml.erb b/jobs/service-fabrik-report/templates/config/settings.yml.erb index b22cabf53..5d5006e96 100644 --- a/jobs/service-fabrik-report/templates/config/settings.yml.erb +++ b/jobs/service-fabrik-report/templates/config/settings.yml.erb @@ -193,17 +193,6 @@ production: identity_provider: <%= identity_provider %> <% end %> - ################### - # DOCKER SETTINGS # - ################### - docker: - url: <%= link("broker").p('docker.url') %> - allocate_docker_host_ports: <%= link("broker").p('docker.allocate_docker_host_ports') %> - volume_driver: <%= link("broker").p('docker.volume_driver') %> - ssl: - ca: <%= JSON.dump(link("broker").p('common.tls_cacert')) %> - cert: <%= JSON.dump(link("broker").p('common.tls_client_cert')) %> - key: <%= JSON.dump(link("broker").p('common.tls_client_key')) %> ##################### # DIRECTOR SETTINGS # ##################### diff --git a/jobs/service-fabrik-scheduler/templates/config/settings.yml.erb b/jobs/service-fabrik-scheduler/templates/config/settings.yml.erb index 96d94450f..bf31c0083 100644 --- a/jobs/service-fabrik-scheduler/templates/config/settings.yml.erb +++ b/jobs/service-fabrik-scheduler/templates/config/settings.yml.erb @@ -266,20 +266,9 @@ production: <% link("broker").if_p('cf.identity_provider') do |identity_provider| %> identity_provider: <%= identity_provider %> <% end %> - - ################### - # DOCKER SETTINGS # - ################### - docker: - url: <%= link("broker").p('docker.url') %> - allocate_docker_host_ports: <%= link("broker").p('docker.allocate_docker_host_ports') %> - volume_driver: <%= link("broker").p('docker.volume_driver') %> - ssl: - ca: <%= JSON.dump(link("broker").p('common.tls_cacert')) %> - cert: <%= JSON.dump(link("broker").p('common.tls_client_cert')) %> - key: <%= JSON.dump(link("broker").p('common.tls_client_key')) %> service_addon_jobs: <%= link("broker").p('service_addon_jobs') %> + ##################### # DIRECTOR SETTINGS # ##################### diff --git a/jobs/swarm_manager/monit b/jobs/swarm_manager/monit deleted file mode 100644 index b8198e9c6..000000000 --- a/jobs/swarm_manager/monit +++ /dev/null @@ -1,5 +0,0 @@ -check process swarm_manager with pidfile /var/vcap/sys/run/swarm_manager/swarm_manager.pid - group vcap - start program "/var/vcap/packages/bosh-helpers/monit_debugger swarm_manager_ctl '/var/vcap/jobs/swarm_manager/bin/swarm_manager_ctl start'" - stop program "/var/vcap/packages/bosh-helpers/monit_debugger swarm_manager_ctl '/var/vcap/jobs/swarm_manager/bin/swarm_manager_ctl stop'" - if failed unixsocket /var/vcap/sys/run/swarm_manager/swarm_manager.sock with timeout 5 seconds for 5 cycles then restart diff --git a/jobs/swarm_manager/spec b/jobs/swarm_manager/spec deleted file mode 100644 index e6fc503f5..000000000 --- a/jobs/swarm_manager/spec +++ /dev/null @@ -1,92 +0,0 @@ ---- -name: swarm_manager - -packages: - - bosh-helpers - - swarm - -templates: - bin/job_properties.sh.erb: bin/job_properties.sh - bin/swarm_manager_ctl: bin/swarm_manager_ctl - config/docker.cacert.erb: config/docker.cacert - config/docker.cert.erb: config/docker.cert - config/docker.key.erb: config/docker.key - -properties: - swarm.name: - description: "Name for swarm manager, used syslog shipper name" - default: "service_fabrik_swarm_manager" - swarm_manager.debug: - description: "Enable debug mode" - default: false - swarm_manager.log_level: - description: "Log level (options: debug, info, warn, error, fatal, panic)" - default: "info" - swarm_manager.listen_address: - description: "Listen address" - default: "0.0.0.0" - swarm_manager.port: - description: "Listen port" - default: "2376" - swarm_manager.strategy: - description: "Placement strategy to use [spread, binpack, random]" - default: "spread" - swarm_manager.filters: - description: "Filters to use [health, port, dependency, affinity, constraint]" - default: ["health", "port", "dependency", "affinity", "constraint"] - swarm_manager.replication: - description: "Enable Swarm manager replication" - default: false - swarm_manager.replication_ttl: - description: "Leader lock release time on failure" - default: "30s" - swarm_manager.advertise: - description: "Address of the Swarm Manager joining the cluster. Other Swarm Manager(s) MUST be able to reach the Swarm Manager at this address." - swarm_manager.heartbeat: - description: "Time in second between each heartbeat" - default: "20s" - swarm_manager.node_heartbeat_retries: - description: "No of retries swarm manager makes to check if docker nodes is healthy again if it was un-healthy previously" - default: "60" - swarm_manager.api_enable_cors: - description: "Enable CORS headers in the remote API" - default: false - swarm_manager.overcommit: - description: "Overcommit to apply on resources" - default: "0.5" - swarm_manager.logs_dir: - description: "logs directory of swarm_manager" - default: "/var/vcap/sys/log/swarm_manager" - - swarm.discovery_options: - description: "Swarm discovery options" - default: [] - swarm.discovery: - description: "Swarm discovery string (ie: consul:///, etcd://,/, zk://,/, [nodes://]," - - swarm.tls: - description: "Use TLS" - default: true - common.tls_cacert: - description: "Trust only remotes providing a certificate signed by the CA given here" - swarm.tls_cert: - description: "TLS certificate file" - swarm.tls_key: - description: "TLS key file" - swarm.tls_verify: - description: "Use TLS and verify the remote" - default: true - - env.http_proxy: - description: "HTTP proxy that Docker should use" - env.https_proxy: - description: "HTTPS proxy that Docker should use" - env.no_proxy: - description: "List of comma-separated hosts that Docker should skip connecting to the proxy" - - broker.syslog.host: - description: "Syslog ingestor host IP of ELK stack" - default: "10.1.4.3" - broker.syslog.port: - description: "Syslog ingestor Port" - default: 5514 diff --git a/jobs/swarm_manager/templates/bin/job_properties.sh.erb b/jobs/swarm_manager/templates/bin/job_properties.sh.erb deleted file mode 100755 index 41165615b..000000000 --- a/jobs/swarm_manager/templates/bin/job_properties.sh.erb +++ /dev/null @@ -1,111 +0,0 @@ -#!/usr/bin/env bash - -# -# Swarm Manager properties -# - -# Directory to store the Swarm Manager configuration files -export SWARM_MANAGER_CONF_DIR=${JOB_DIR}/config - -# Directory to store the Swarm Manager logs -export SWARM_MANAGER_LOG_DIR=${LOG_DIR} - -# Directory to store the Swarm Manager process IDs -export SWARM_MANAGER_PID_DIR=${RUN_DIR} - -# Directory to store the Swarm Manager data files -export SWARM_MANAGER_STORE_DIR=${STORE_DIR} - -# Directory to store the Swarm Manager temp files -export SWARM_MANAGER_TMP_DIR=${TMP_DIR} - -# Enable debug mode -export SWARM_MANAGER_DEBUG="--debug=<%= p('swarm_manager.debug') %>" - -# Log level -export SWARM_MANAGER_LOG_LEVEL="--log-level=<%= p('swarm_manager.log_level') %>" - -# IP:Port to listen on -export SWARM_MANAGER_HOST="--host=<%= p('swarm_manager.listen_address') %>:<%= p('swarm_manager.port') %>" - -# Placement strategy to use -export SWARM_MANAGER_STRATEGY="--strategy=<%= p('swarm_manager.strategy') %>" - -# Filters to use -export SWARM_MANAGER_FILTERS="<%= p('swarm_manager.filters', []).map { |filter| "--filter=#{filter}" }.join(' ') %>" - -# Enable Swarm manager replication -export SWARM_MANAGER_REPLICATION="--replication=<%= p('swarm_manager.replication') %>" - -# Leader lock release time on failure -export SWARM_MANAGER_REPLICATION_TTL="--replication-ttl=<%= p('swarm_manager.replication_ttl') %>" - -<% -def openstruct_to_hash(os) - os.marshal_dump.map do |key, element| - element.is_a?(OpenStruct) ? { key => openstruct_to_hash(element) } : { key => element } - end.reduce(&:merge) -end - -networks = openstruct_to_hash(spec.networks) -default_ip = networks.values.find { |net| net.has_key?(:default) }[:ip] -%> -# Address of the Swarm Manager joining the cluster -export SWARM_MANAGER_ADVERTISE="--advertise=<%= "#{p('swarm_manager.advertise', default_ip)}:#{p('swarm_manager.port')}" %>" - -# Time in second between each heartbeat -export SWARM_MANAGER_HEARTBEAT="--heartbeat=<%= p('swarm_manager.heartbeat') %>" - -# No of retries swarm manager makes to check if docker nodes is healthy again if it was un-healthy previously -export SWARM_MANAGER_HEARTBEAT_RETRIES="--engine-failure-retry=<%= p('swarm_manager.node_heartbeat_retries') %>" - -# Enable CORS headers in the remote API -export SWARM_MANAGER_API_ENABLE_CORS="--api-enable-cors=<%= p('swarm_manager.api_enable_cors') %>" - -# Overcommit to apply on resources -export SWARM_MANAGER_OVERCOMMIT="--cluster-opt=swarm.overcommit=<%= p('swarm_manager.overcommit') %>" - -# Use TLS -export SWARM_MANAGER_TLS="--tls=<%= p('swarm.tls') %>" - -<% if_p('common.tls_cacert') do |tls_cacert| %> -# Trust only remotes providing a certificate signed by the CA given here -export SWARM_MANAGER_TLS_CACERT="--tlscacert=${SWARM_MANAGER_CONF_DIR}/docker.cacert" -<% end %> - -<% if_p('swarm.tls_cert') do |tls_cert| %> -# Path to TLS certificate file -export SWARM_MANAGER_TLS_CERT="--tlscert=${SWARM_MANAGER_CONF_DIR}/docker.cert" -<% end %> - -<% if_p('swarm.tls_key') do |tls_key| %> -# Path to TLS key file -export SWARM_MANAGER_TLS_KEY="--tlskey=${SWARM_MANAGER_CONF_DIR}/docker.key" -<% end %> - -<% if p('swarm.tls_verify', true) %> -# Use TLS and verify the remote -export SWARM_MANAGER_TLS_VERIFY="--tlsverify=true" -<% end %> - -<% if_p('swarm.discovery_options') do |discovery_options| %> -# Swarm discovery options -export SWARM_MANAGER_DISCOVERY_OPTIONS="<%= discovery_options.map { |discovery_option| "--discovery-opt=#{discovery_option}" }.join(' ') %>" -<% end %> - -# Swarm discovery -export SWARM_MANAGER_DISCOVERY="<%= p('swarm.discovery') %>" - -# Proxy configuration -<% if_p('env.http_proxy') do |http_proxy| %> -export HTTP_PROXY="<%= http_proxy %>" -export http_proxy="<%= http_proxy %>" -<% end %> -<% if_p('env.https_proxy') do |https_proxy| %> -export HTTPS_PROXY="<%= https_proxy %>" -export https_proxy="<%= https_proxy %>" -<% end %> -<% if_p('env.no_proxy') do |no_proxy| %> -export NO_PROXY="<%= no_proxy %>" -export no_proxy="<%= no_proxy %>" -<% end %> diff --git a/jobs/swarm_manager/templates/bin/swarm_manager_ctl b/jobs/swarm_manager/templates/bin/swarm_manager_ctl deleted file mode 100755 index 995b52a46..000000000 --- a/jobs/swarm_manager/templates/bin/swarm_manager_ctl +++ /dev/null @@ -1,56 +0,0 @@ -#!/bin/bash - -set -e # exit immediately if a simple command exits with a non-zero status - -# Setup common env vars and folders -source /var/vcap/packages/bosh-helpers/ctl_setup.sh 'swarm_manager' -export SWARM_MANAGER_PID_FILE=${SWARM_MANAGER_PID_DIR}/swarm_manager.pid - -case $1 in - - start) - pid_guard ${SWARM_MANAGER_PID_FILE} ${JOB_NAME} - echo $$ > ${SWARM_MANAGER_PID_FILE} - - # Start Swarm Manager daemon - exec chpst -u vcap:vcap /var/vcap/packages/swarm/bin/swarm \ - ${SWARM_MANAGER_DEBUG} \ - ${SWARM_MANAGER_LOG_LEVEL} \ - manage \ - --cluster-driver="swarm" \ - --host unix://${SWARM_MANAGER_PID_DIR}/swarm_manager.sock \ - --engine-failure-retry 10 \ - ${SWARM_MANAGER_HOST} \ - ${SWARM_MANAGER_STRATEGY} \ - ${SWARM_MANAGER_FILTERS} \ - ${SWARM_MANAGER_REPLICATION} \ - ${SWARM_MANAGER_REPLICATION_TTL} \ - ${SWARM_MANAGER_ADVERTISE} \ - ${SWARM_MANAGER_HEARTBEAT} \ - ${SWARM_MANAGER_HEARTBEAT_RETRIES} \ - ${SWARM_MANAGER_API_ENABLE_CORS} \ - ${SWARM_MANAGER_OVERCOMMIT} \ - ${SWARM_MANAGER_TLS} \ - ${SWARM_MANAGER_TLS_CACERT:-} \ - ${SWARM_MANAGER_TLS_CERT:-} \ - ${SWARM_MANAGER_TLS_KEY:-} \ - ${SWARM_MANAGER_TLS_VERIFY:-} \ - ${SWARM_MANAGER_DISCOVERY_OPTIONS:-} \ - ${SWARM_MANAGER_DISCOVERY} \ - >>${SWARM_MANAGER_LOG_DIR}/${OUTPUT_LABEL}.stdout.log \ - 2>>${SWARM_MANAGER_LOG_DIR}/${OUTPUT_LABEL}.stderr.log - ;; - - - stop) - # Stop Swarm Manager daemon - kill_and_wait ${SWARM_MANAGER_PID_FILE} - ;; - - *) - echo "Usage: $0 {start|stop}" - exit 1 - ;; - -esac -exit 0 diff --git a/jobs/swarm_manager/templates/config/docker.cacert.erb b/jobs/swarm_manager/templates/config/docker.cacert.erb deleted file mode 100644 index 2df09e6a9..000000000 --- a/jobs/swarm_manager/templates/config/docker.cacert.erb +++ /dev/null @@ -1 +0,0 @@ -<% if_p('common.tls_cacert') do |cert| %><% if cert.index("\n").nil? %><%= cert.gsub('\\n', "\n") %><% else %><%= cert %><% end %><% end %> diff --git a/jobs/swarm_manager/templates/config/docker.cert.erb b/jobs/swarm_manager/templates/config/docker.cert.erb deleted file mode 100644 index 08f2c3be0..000000000 --- a/jobs/swarm_manager/templates/config/docker.cert.erb +++ /dev/null @@ -1 +0,0 @@ -<% if_p('swarm.tls_cert') do |cert| %><% if cert.index("\n").nil? %><%= cert.gsub('\\n', "\n") %><% else %><%= cert %><% end %><% end %> diff --git a/jobs/swarm_manager/templates/config/docker.key.erb b/jobs/swarm_manager/templates/config/docker.key.erb deleted file mode 100644 index c410d92c0..000000000 --- a/jobs/swarm_manager/templates/config/docker.key.erb +++ /dev/null @@ -1 +0,0 @@ -<% if_p('swarm.tls_key') do |cert| %><% if cert.index("\n").nil? %><%= cert.gsub('\\n', "\n") %><% else %><%= cert %><% end %><% end %> diff --git a/packages/docker/packaging b/packages/docker/packaging deleted file mode 100755 index daff804c8..000000000 --- a/packages/docker/packaging +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/bash - -set -e # exit immediately if a simple command exits with a non-zero status -set -u # report the usage of uninitialized variables - -# Detect # of CPUs so make jobs can be parallelized -CPUS=`grep -c ^processor /proc/cpuinfo` - -# We grab the latest versions that are in the directory -AUFS_TOOLS_VERSION=`ls -r docker/aufs-tools_*.deb | sed 's/docker\/aufs-tools_\(.*\).deb/\1/' | head -1` -AUTOCONF_VERSION=`ls -r docker/autoconf-*.tar.gz | sed 's/docker\/autoconf-\(.*\)\.tar\.gz/\1/' | head -1` -DOCKER_VERSION=`ls -r docker/docker-*.tgz | sed 's/docker\/docker-\(.*\)\.tgz/\1/' | head -1` - -# Extract Autoconf package -echo "Extracting Autoconf ${AUTOCONF_VERSION}..." -tar xzvf ${BOSH_COMPILE_TARGET}/docker/autoconf-${AUTOCONF_VERSION}.tar.gz -if [[ $? != 0 ]] ; then - echo "Failed extracting Autoconf ${AUTOCONF_VERSION}" - exit 1 -fi - -# Build Autoconf package -echo "Building Autoconf ${AUTOCONF_VERSION}..." -cd ${BOSH_COMPILE_TARGET}/autoconf-${AUTOCONF_VERSION} -./configure -make -j${CPUS} -make install - -# Extract docker package -echo "Extracting docker ${DOCKER_VERSION}..." -tar xzvf ${BOSH_COMPILE_TARGET}/docker/docker-${DOCKER_VERSION}.tgz -if [[ $? != 0 ]] ; then - echo "Failed extracting docker ${DOCKER_VERSION}" - exit 1 -fi - -# Copy docker binaries -echo "Copying docker ${DOCKER_VERSION} binaries..." -mkdir -p ${BOSH_INSTALL_TARGET}/bin -cp docker/* ${BOSH_INSTALL_TARGET}/bin -chmod +x ${BOSH_INSTALL_TARGET}/bin/* - -# Install aufs-tool deb package -echo "Copying aufs-tools ${AUFS_TOOLS_VERSION}..." -cp -a ${BOSH_COMPILE_TARGET}/docker/aufs-tools_${AUFS_TOOLS_VERSION}.deb ${BOSH_INSTALL_TARGET}/ - diff --git a/packages/docker/spec b/packages/docker/spec deleted file mode 100755 index e2648bfb3..000000000 --- a/packages/docker/spec +++ /dev/null @@ -1,7 +0,0 @@ ---- -name: docker -dependencies: [] -files: - - docker/aufs-tools_20120411-3_amd64.deb - - docker/autoconf-2.69.tar.gz - - docker/docker-19.03.3.tgz diff --git a/packages/lvm2/packaging b/packages/lvm2/packaging deleted file mode 100644 index 06565f7eb..000000000 --- a/packages/lvm2/packaging +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/bash - -set -e # exit immediately if a simple command exits with a non-zero status -set -u # report the usage of uninitialized variables - -# Available variables -# $BOSH_COMPILE_TARGET - where this package & spec'd source files are available -# $BOSH_INSTALL_TARGET - where you copy/install files to be included in package - -# We see lock issues, maybe we can check these? - -# Packages for Xenial -if [[ `lsb_release -cs` == "xenial" ]]; then - - for DEB in $(ls -1 apt/xenial/lvm2/*.deb); do - echo "Installing $(basename $DEB)" - cp -a $DEB ${BOSH_INSTALL_TARGET}/ - done - -elif [[ `lsb_release -cs` == "bionic" ]]; then - - for DEB in $(ls -1 apt/bionic/lvm2/*.deb); do - echo "Installing $(basename $DEB)" - cp -a $DEB ${BOSH_INSTALL_TARGET}/ - done - -elif [[ `lsb_release -cs` == "trusty" ]]; then - # Packages for ubuntu Trusty - for DEB in $(ls -1 apt/lvm2/*.deb); do - echo "Installing $(basename $DEB)" - cp -a $DEB ${BOSH_INSTALL_TARGET}/ - done - -elif [[ `lsb_release -cs` == "jammy" ]]; then - - for DEB in $(ls -1 apt/jammy/*.deb); do - echo "Installing $(basename $DEB)" - cp -a $DEB ${BOSH_INSTALL_TARGET}/ - done -fi diff --git a/packages/lvm2/spec b/packages/lvm2/spec deleted file mode 100644 index 6b24cc96d..000000000 --- a/packages/lvm2/spec +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: lvm2 -dependencies: [] -files: -- apt/xenial/lvm2/*.deb -- apt/bionic/lvm2/*.deb -- apt/lvm2/*.deb -- apt/jammy/*.deb diff --git a/packages/lvmvd/packaging b/packages/lvmvd/packaging deleted file mode 100644 index 7b713c23e..000000000 --- a/packages/lvmvd/packaging +++ /dev/null @@ -1,27 +0,0 @@ -set -e # exit immediately if a simple command exits with a non-zero status -set -u # report the usage of uninitialized variables - -# Set Golang dependency -if [ -z "${BOSH_PACKAGES_DIR:-}" ]; then - export GOROOT=$(readlink -nf /var/vcap/packages/golang) -else - export GOROOT=$BOSH_PACKAGES_DIR/golang -fi -export GOCACHE=/var/vcap/data/golang/cache -export GOPATH="${PWD}" -export PATH=${GOROOT}/bin:${GOPATH}/bin:${PATH} -export GO111MODULE=off - -# Build lvm volume driver -echo "Building lvmvd..." - -ls -alR -cd lvm-volume-driver -export GOPATH=`pwd` -cd src -go build lvmvd.go -mkdir ${BOSH_INSTALL_TARGET}/bin -cp lvmvd ${BOSH_INSTALL_TARGET}/bin - -# Clean up src & pkg artifacts -rm -rf ${BOSH_INSTALL_TARGET}/pkg ${BOSH_INSTALL_TARGET}/src diff --git a/packages/lvmvd/spec b/packages/lvmvd/spec deleted file mode 100644 index dd3aafea1..000000000 --- a/packages/lvmvd/spec +++ /dev/null @@ -1,6 +0,0 @@ ---- -name: lvmvd -dependencies: - - golang -files: - - lvm-volume-driver/**/* diff --git a/packages/swarm/packaging b/packages/swarm/packaging deleted file mode 100644 index 15f09b8e4..000000000 --- a/packages/swarm/packaging +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/bash - -set -e # exit immediately if a simple command exits with a non-zero status -set -u # report the usage of uninitialized variables - -# Set Golang dependency -if [ -z "${BOSH_PACKAGES_DIR:-}" ]; then - export GOROOT=$(readlink -nf /var/vcap/packages/golang) -else - export GOROOT=$BOSH_PACKAGES_DIR/golang -fi -export GOCACHE=/var/vcap/data/golang/cache -export GOPATH="${PWD}" -export PATH=${GOROOT}/bin:${GOPATH}/bin:${PATH} - -# Build Docker Swarm package -echo "Building Docker Swarm..." -PACKAGE_NAME=github.com/docker/swarm -mkdir -p ${BOSH_INSTALL_TARGET}/src/${PACKAGE_NAME} -export GOPATH=${BOSH_INSTALL_TARGET} -export GO111MODULE=off - -# Extract Docker Swarm package -SWARM_VERSION=`ls -r docker/swarm* | sed 's/docker\/swarm-\(.*\)\.zip/\1/' | head -1` -echo "Extracting Docker Swarm ${SWARM_VERSION}..." -unzip docker/swarm-${SWARM_VERSION}.zip -if [[ $? != 0 ]] ; then - echo "Failed extracting Docker Swarm ${SWARM_VERSION}" - exit 1 -fi - -cp -a classicswarm-${SWARM_VERSION}/* ${BOSH_INSTALL_TARGET}/src/${PACKAGE_NAME} -if [[ $? != 0 ]] ; then - echo "Failed copying Docker Swarm ${SWARM_VERSION}" - exit 1 -fi - -go install ${PACKAGE_NAME} - -# Clean up src & pkg artifacts -rm -rf ${BOSH_INSTALL_TARGET}/pkg ${BOSH_INSTALL_TARGET}/src diff --git a/packages/swarm/spec b/packages/swarm/spec deleted file mode 100644 index b252a93ea..000000000 --- a/packages/swarm/spec +++ /dev/null @@ -1,6 +0,0 @@ ---- -name: swarm -dependencies: - - golang -files: - - docker/swarm-1.2.9.zip diff --git a/src/github.com/docker/swarm b/src/github.com/docker/swarm deleted file mode 160000 index 48d86b12e..000000000 --- a/src/github.com/docker/swarm +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 48d86b12ed1fc2b55c9b236e709259d0b0592412 diff --git a/src/lvm-volume-driver b/src/lvm-volume-driver deleted file mode 160000 index bec5c65b6..000000000 --- a/src/lvm-volume-driver +++ /dev/null @@ -1 +0,0 @@ -Subproject commit bec5c65b6a3a11244c8e4fc12826bb6dc5600673