Skip to content

Commit 98d3fe8

Browse files
petergtzidev4u
authored andcommitted
Provide ops-files for more Bits-Service backends
Backends: Alicloud, Azure, Google, Openstack/Swift. [#157017532] Signed-off-by: Norman Sutorius <[email protected]>
1 parent 4d95dcb commit 98d3fe8

9 files changed

+144
-1
lines changed

operations/example-vars-files/vars-use-alicloud-oss-blobstore.yml

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
blobstore_region: cn-hangzhou
2+
blobstore_endpoint: oss-cn-hangzhou.aliyuncs.com
23
blobstore_access_key_id: example-access-key-id
34
blobstore_secret_access_key: example-secret-access-key
45
blobstore_bucket_name: example-oss-bucket-name

operations/example-vars-files/vars-use-swift-blobstore.yml

+2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
openstack_password: openstack_password
22
auth_url: https://auth.url
33
openstack_domain: openstack_domain
4+
openstack_domain_id: openstack_domain_id
45
openstack_project: openstack_project
6+
openstack_region: openstack_region
57
openstack_temp_url_key: openstack_temp_url_key
68
openstack_username: openstack_username
79

operations/experimental/README.md

+6-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,12 @@ and the ops-files will be removed.
2121
| [`add-cflinuxfs3.yml`](add-cflinuxfs3.yml) | Add the cflinuxfs3 [stack](https://docs.cloudfoundry.org/devguide/deploy-apps/stacks.html) and buildpacks | Use this opsfile for testing component and app compatibility with cflinuxfs3 in advance of changing the default rootfs. |
2222
| [`bits-service.yml`](bits-service.yml) | Adds the [bits-service](https://github.com/cloudfoundry-incubator/bits-service) job and enables it in the cloud-controller. | Also requires one of `bits-service-{local,webdav,s3}.yml` from the same directory. |
2323
| [`bits-service-local.yml`](bits-service-local.yml) | Use local storage for the [bits-service](https://github.com/cloudfoundry-incubator/bits-service). | |
24-
| [`bits-service-s3.yml`](bits-service-s3.yml) | Use s3 storage for the [bits-service](https://github.com/cloudfoundry-incubator/bits-service). | `use-s3-blobstore.yml` is also required. |
24+
| [`bits-service-s3.yml`](bits-service-s3.yml) | Use s3 storage for the [bits-service](https://github.com/cloudfoundry-incubator/bits-service). | `use-s3-blobstore.yml` from the root `operations` directory is also required. |
25+
| [`bits-service-alicloud-oss.yml`](bits-service-alicloud-oss.yml) | Use Alicloud for the [bits-service](https://github.com/cloudfoundry-incubator/bits-service). | `use-alicloud-oss-blobstore.yml` from the root `operations` directory is also required. |
26+
| [`bits-service-azure-storage.yml`](bits-service-azure-storage.yml) | Use Azure Storage for the [bits-service](https://github.com/cloudfoundry-incubator/bits-service). | `use-azure-storage-blobstore.yml` from the root `operations` directory is also required. |
27+
| [`bits-service-gcs-service-account.yml`](bits-service-gcs-service-account.yml) | Use Google storage with a service account credentials for the [bits-service](https://github.com/cloudfoundry-incubator/bits-service). | `use-gcs-blobstore-service-account.yml` from the root `operations` directory is also required. |
28+
| [`bits-service-gcs-access-key.yml`](bits-service-gcs-access-key.yml) | Use Google storage with access key credentials for the [bits-service](https://github.com/cloudfoundry-incubator/bits-service). | `use-gcs-blobstore-access-key.yml` from the root `operations` directory is also required. |
29+
| [`bits-service-swift.yml`](bits-service-swift.yml) | Use Openstack/Swift for the [bits-service](https://github.com/cloudfoundry-incubator/bits-service). | `use-swift-blobstore.yml` from the root `operations` directory is also required. |
2530
| [`bits-service-webdav.yml`](bits-service-webdav.yml) | Use the `blobstore`'s webdav storage for the [bits-service](https://github.com/cloudfoundry-incubator/bits-service). | Requires the `blobstore` job. |
2631
| [`disable-interpolate-service-bindings.yml`](disable-interpolate-service-bindings.yml) | Disables the interpolation of CredHub service credentials by Cloud Controller. |
2732
| [`disable-consul.yml`](disable-consul.yml) | Removes `consul` instance group and `consul_agent` jobs and prevents the `auctioneer`, `ssh_proxy`, `file_server`, `rep`, `locket`, and `bbs` jobs from registering as a service with Consul | |
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
---
2+
- type: replace
3+
path: /instance_groups/name=bits/jobs/name=bits-service/properties/bits-service/app_stash
4+
value:
5+
directory_key: ((resource_directory_key))
6+
fog_connection: &alicloud-config
7+
provider: aliyun
8+
aliyun_accesskey_id: ((blobstore_access_key_id))
9+
aliyun_accesskey_secret: ((blobstore_secret_access_key))
10+
aliyun_oss_endpoint: ((blobstore_endpoint))
11+
- type: replace
12+
path: /instance_groups/name=bits/jobs/name=bits-service/properties/bits-service/buildpacks
13+
value:
14+
directory_key: ((buildpack_directory_key))
15+
fog_connection: *alicloud-config
16+
- type: replace
17+
path: /instance_groups/name=bits/jobs/name=bits-service/properties/bits-service/droplets
18+
value:
19+
directory_key: ((droplet_directory_key))
20+
fog_connection: *alicloud-config
21+
- type: replace
22+
path: /instance_groups/name=bits/jobs/name=bits-service/properties/bits-service/packages
23+
value:
24+
directory_key: ((app_package_directory_key))
25+
fog_connection: *alicloud-config
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
---
2+
- type: replace
3+
path: /instance_groups/name=bits/jobs/name=bits-service/properties/bits-service/app_stash
4+
value:
5+
directory_key: ((resource_directory_key))
6+
fog_connection: &fog_connection
7+
provider: AzureRM
8+
environment: ((environment))
9+
azure_storage_account_name: ((blobstore_storage_account_name))
10+
azure_storage_access_key: ((blobstore_storage_access_key))
11+
12+
- type: replace
13+
path: /instance_groups/name=bits/jobs/name=bits-service/properties/bits-service/buildpacks
14+
value:
15+
directory_key: ((buildpack_directory_key))
16+
fog_connection: *fog_connection
17+
- type: replace
18+
path: /instance_groups/name=bits/jobs/name=bits-service/properties/bits-service/droplets
19+
value:
20+
directory_key: ((droplet_directory_key))
21+
fog_connection: *fog_connection
22+
- type: replace
23+
path: /instance_groups/name=bits/jobs/name=bits-service/properties/bits-service/packages
24+
value:
25+
directory_key: ((app_package_directory_key))
26+
fog_connection: *fog_connection
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
---
2+
- type: replace
3+
path: /instance_groups/name=bits/jobs/name=bits-service/properties/bits-service/app_stash
4+
value:
5+
directory_key: ((resource_directory_key))
6+
fog_connection: &fog_connection
7+
provider: Google
8+
google_storage_access_key_id: ((blobstore_access_key_id))
9+
google_storage_secret_access_key: ((blobstore_secret_access_key))
10+
11+
- type: replace
12+
path: /instance_groups/name=bits/jobs/name=bits-service/properties/bits-service/buildpacks
13+
value:
14+
directory_key: ((buildpack_directory_key))
15+
fog_connection: *fog_connection
16+
- type: replace
17+
path: /instance_groups/name=bits/jobs/name=bits-service/properties/bits-service/droplets
18+
value:
19+
directory_key: ((droplet_directory_key))
20+
fog_connection: *fog_connection
21+
- type: replace
22+
path: /instance_groups/name=bits/jobs/name=bits-service/properties/bits-service/packages
23+
value:
24+
directory_key: ((app_package_directory_key))
25+
fog_connection: *fog_connection
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
---
2+
- type: replace
3+
path: /instance_groups/name=bits/jobs/name=bits-service/properties/bits-service/app_stash
4+
value:
5+
directory_key: ((resource_directory_key))
6+
fog_connection: &fog_connection
7+
provider: Google
8+
google_project: ((gcs_project))
9+
google_client_email: ((gcs_service_account_email))
10+
google_json_key_string: ((gcs_service_account_json_key))
11+
12+
- type: replace
13+
path: /instance_groups/name=bits/jobs/name=bits-service/properties/bits-service/buildpacks
14+
value:
15+
directory_key: ((buildpack_directory_key))
16+
fog_connection: *fog_connection
17+
- type: replace
18+
path: /instance_groups/name=bits/jobs/name=bits-service/properties/bits-service/droplets
19+
value:
20+
directory_key: ((droplet_directory_key))
21+
fog_connection: *fog_connection
22+
- type: replace
23+
path: /instance_groups/name=bits/jobs/name=bits-service/properties/bits-service/packages
24+
value:
25+
directory_key: ((app_package_directory_key))
26+
fog_connection: *fog_connection
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
---
2+
- type: replace
3+
path: /instance_groups/name=bits/jobs/name=bits-service/properties/bits-service/app_stash
4+
value:
5+
directory_key: ((resource_directory_key))
6+
fog_connection: &fog_connection
7+
provider: OpenStack
8+
openstack_api_key: ((openstack_password))
9+
openstack_auth_url: ((auth_url))
10+
openstack_domain_id: ((openstack_domain_id))
11+
openstack_region: ((openstack_region))
12+
openstack_temp_url_key: ((openstack_temp_url_key))
13+
openstack_username: ((openstack_username))
14+
- type: replace
15+
path: /instance_groups/name=bits/jobs/name=bits-service/properties/bits-service/buildpacks
16+
value:
17+
directory_key: ((buildpack_directory_key))
18+
fog_connection: *fog_connection
19+
- type: replace
20+
path: /instance_groups/name=bits/jobs/name=bits-service/properties/bits-service/droplets
21+
value:
22+
directory_key: ((droplet_directory_key))
23+
fog_connection: *fog_connection
24+
- type: replace
25+
path: /instance_groups/name=bits/jobs/name=bits-service/properties/bits-service/packages
26+
value:
27+
directory_key: ((app_package_directory_key))
28+
fog_connection: *fog_connection

scripts/test-experimental-ops.sh

+5
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,11 @@ test_experimental_ops() {
1212
check_interpolation "bits-service.yml"
1313
check_interpolation "name: bits-service-local.yml" "bits-service.yml" "-o bits-service-local.yml"
1414
check_interpolation "name: bits-service-s3.yml" "${home}/operations/use-external-blobstore.yml" "-o ${home}/operations/use-s3-blobstore.yml" "-o bits-service.yml" "-o bits-service-s3.yml" "-l ${home}/operations/example-vars-files/vars-use-s3-blobstore.yml"
15+
check_interpolation "name: bits-service-alicloud-oss.yml" "${home}/operations/use-external-blobstore.yml" "-o ${home}/operations/use-alicloud-oss-blobstore.yml" "-o bits-service.yml" "-o bits-service-alicloud-oss.yml" "-l ${home}/operations/example-vars-files/vars-use-alicloud-oss-blobstore.yml"
16+
check_interpolation "name: bits-service-azure-storage.yml" "${home}/operations/use-external-blobstore.yml" "-o ${home}/operations/use-azure-storage-blobstore.yml" "-o bits-service.yml" "-o bits-service-azure-storage.yml" "-l ${home}/operations/example-vars-files/vars-use-azure-storage-blobstore.yml"
17+
check_interpolation "name: bits-service-gcs-service-account.yml" "${home}/operations/use-external-blobstore.yml" "-o ${home}/operations/use-gcs-blobstore-service-account.yml" "-o bits-service.yml" "-o bits-service-gcs-service-account.yml" "-l ${home}/operations/example-vars-files/vars-use-gcs-blobstore-service-account.yml"
18+
check_interpolation "name: bits-service-gcs-access-key.yml" "${home}/operations/use-external-blobstore.yml" "-o ${home}/operations/use-gcs-blobstore-access-key.yml" "-o bits-service.yml" "-o bits-service-gcs-access-key.yml" "-l ${home}/operations/example-vars-files/vars-use-gcs-blobstore-access-key.yml"
19+
check_interpolation "name: bits-service-swift.yml" "${home}/operations/use-external-blobstore.yml" "-o ${home}/operations/use-swift-blobstore.yml" "-o bits-service.yml" "-o bits-service-swift.yml" "-l ${home}/operations/example-vars-files/vars-use-swift-blobstore.yml"
1520
check_interpolation "name: bits-service-webdav.yml" "bits-service.yml" "-o bits-service-webdav.yml"
1621

1722
check_interpolation "disable-consul.yml"

0 commit comments

Comments
 (0)