diff --git a/cf-deployment-operations/use-azure-storage-cli.yml b/cf-deployment-operations/use-azure-storage-cli.yml deleted file mode 100644 index 981615b..0000000 --- a/cf-deployment-operations/use-azure-storage-cli.yml +++ /dev/null @@ -1,209 +0,0 @@ ---- -# Azure storage-cli for CC (all scopes, all CC jobs) - -# ========= api ========= -- type: replace - path: /instance_groups/name=api/jobs/name=cloud_controller_ng/properties/cc/buildpacks/blobstore_type? - value: storage-cli -- type: replace - path: /instance_groups/name=api/jobs/name=cloud_controller_ng/properties/cc/buildpacks/blobstore_provider? - value: AzureRM -- type: replace - path: /instance_groups/name=api/jobs/name=cloud_controller_ng/properties/cc/buildpacks/connection_config? - value: - provider: AzureRM - environment: ((environment)) - azure_storage_account_name: ((blobstore_storage_account_name)) - azure_storage_access_key: ((blobstore_storage_access_key)) - container_name: ((buildpack_directory_key)) -- type: remove - path: /instance_groups/name=api/jobs/name=cloud_controller_ng/properties/cc/buildpacks/fog_connection? - -- type: replace - path: /instance_groups/name=api/jobs/name=cloud_controller_ng/properties/cc/droplets/blobstore_type? - value: storage-cli -- type: replace - path: /instance_groups/name=api/jobs/name=cloud_controller_ng/properties/cc/droplets/blobstore_provider? - value: AzureRM -- type: replace - path: /instance_groups/name=api/jobs/name=cloud_controller_ng/properties/cc/droplets/connection_config? - value: - provider: AzureRM - environment: ((environment)) - azure_storage_account_name: ((blobstore_storage_account_name)) - azure_storage_access_key: ((blobstore_storage_access_key)) - container_name: ((droplet_directory_key)) -- type: remove - path: /instance_groups/name=api/jobs/name=cloud_controller_ng/properties/cc/droplets/fog_connection? - -- type: replace - path: /instance_groups/name=api/jobs/name=cloud_controller_ng/properties/cc/packages/blobstore_type? - value: storage-cli -- type: replace - path: /instance_groups/name=api/jobs/name=cloud_controller_ng/properties/cc/packages/blobstore_provider? - value: AzureRM -- type: replace - path: /instance_groups/name=api/jobs/name=cloud_controller_ng/properties/cc/packages/connection_config? - value: - provider: AzureRM - environment: ((environment)) - azure_storage_account_name: ((blobstore_storage_account_name)) - azure_storage_access_key: ((blobstore_storage_access_key)) - container_name: ((app_package_directory_key)) -- type: remove - path: /instance_groups/name=api/jobs/name=cloud_controller_ng/properties/cc/packages/fog_connection? - -- type: replace - path: /instance_groups/name=api/jobs/name=cloud_controller_ng/properties/cc/resource_pool/blobstore_type? - value: storage-cli -- type: replace - path: /instance_groups/name=api/jobs/name=cloud_controller_ng/properties/cc/resource_pool/blobstore_provider? - value: AzureRM -- type: replace - path: /instance_groups/name=api/jobs/name=cloud_controller_ng/properties/cc/resource_pool/connection_config? - value: - provider: AzureRM - environment: ((environment)) - azure_storage_account_name: ((blobstore_storage_account_name)) - azure_storage_access_key: ((blobstore_storage_access_key)) - container_name: ((resource_directory_key)) -- type: remove - path: /instance_groups/name=api/jobs/name=cloud_controller_ng/properties/cc/resource_pool/fog_connection? - -# ========= cc-worker ========= -- type: replace - path: /instance_groups/name=cc-worker/jobs/name=cloud_controller_worker/properties/cc/buildpacks/blobstore_type? - value: storage-cli -- type: replace - path: /instance_groups/name=cc-worker/jobs/name=cloud_controller_worker/properties/cc/buildpacks/blobstore_provider? - value: AzureRM -- type: replace - path: /instance_groups/name=cc-worker/jobs/name=cloud_controller_worker/properties/cc/buildpacks/connection_config? - value: - provider: AzureRM - environment: ((environment)) - azure_storage_account_name: ((blobstore_storage_account_name)) - azure_storage_access_key: ((blobstore_storage_access_key)) - container_name: ((buildpack_directory_key)) -- type: remove - path: /instance_groups/name=cc-worker/jobs/name=cloud_controller_worker/properties/cc/buildpacks/fog_connection? - -- type: replace - path: /instance_groups/name=cc-worker/jobs/name=cloud_controller_worker/properties/cc/droplets/blobstore_type? - value: storage-cli -- type: replace - path: /instance_groups/name=cc-worker/jobs/name=cloud_controller_worker/properties/cc/droplets/blobstore_provider? - value: AzureRM -- type: replace - path: /instance_groups/name=cc-worker/jobs/name=cloud_controller_worker/properties/cc/droplets/connection_config? - value: - provider: AzureRM - environment: ((environment)) - azure_storage_account_name: ((blobstore_storage_account_name)) - azure_storage_access_key: ((blobstore_storage_access_key)) - container_name: ((droplet_directory_key)) -- type: remove - path: /instance_groups/name=cc-worker/jobs/name=cloud_controller_worker/properties/cc/droplets/fog_connection? - -- type: replace - path: /instance_groups/name=cc-worker/jobs/name=cloud_controller_worker/properties/cc/packages/blobstore_type? - value: storage-cli -- type: replace - path: /instance_groups/name=cc-worker/jobs/name=cloud_controller_worker/properties/cc/packages/blobstore_provider? - value: AzureRM -- type: replace - path: /instance_groups/name=cc-worker/jobs/name=cloud_controller_worker/properties/cc/packages/connection_config? - value: - provider: AzureRM - environment: ((environment)) - azure_storage_account_name: ((blobstore_storage_account_name)) - azure_storage_access_key: ((blobstore_storage_access_key)) - container_name: ((app_package_directory_key)) -- type: remove - path: /instance_groups/name=cc-worker/jobs/name=cloud_controller_worker/properties/cc/packages/fog_connection? - -- type: replace - path: /instance_groups/name=cc-worker/jobs/name=cloud_controller_worker/properties/cc/resource_pool/blobstore_type? - value: storage-cli -- type: replace - path: /instance_groups/name=cc-worker/jobs/name=cloud_controller_worker/properties/cc/resource_pool/blobstore_provider? - value: AzureRM -- type: replace - path: /instance_groups/name=cc-worker/jobs/name=cloud_controller_worker/properties/cc/resource_pool/connection_config? - value: - provider: AzureRM - environment: ((environment)) - azure_storage_account_name: ((blobstore_storage_account_name)) - azure_storage_access_key: ((blobstore_storage_access_key)) - container_name: ((resource_directory_key)) -- type: remove - path: /instance_groups/name=cc-worker/jobs/name=cloud_controller_worker/properties/cc/resource_pool/fog_connection? - -# ========= scheduler (clock) ========= -- type: replace - path: /instance_groups/name=scheduler/jobs/name=cloud_controller_clock/properties/cc/buildpacks/blobstore_type? - value: storage-cli -- type: replace - path: /instance_groups/name=scheduler/jobs/name=cloud_controller_clock/properties/cc/buildpacks/blobstore_provider? - value: AzureRM -- type: replace - path: /instance_groups/name=scheduler/jobs/name=cloud_controller_clock/properties/cc/buildpacks/connection_config? - value: - provider: AzureRM - environment: ((environment)) - azure_storage_account_name: ((blobstore_storage_account_name)) - azure_storage_access_key: ((blobstore_storage_access_key)) - container_name: ((buildpack_directory_key)) -- type: remove - path: /instance_groups/name=scheduler/jobs/name=cloud_controller_clock/properties/cc/buildpacks/fog_connection? - -- type: replace - path: /instance_groups/name=scheduler/jobs/name=cloud_controller_clock/properties/cc/droplets/blobstore_type? - value: storage-cli -- type: replace - path: /instance_groups/name=scheduler/jobs/name=cloud_controller_clock/properties/cc/droplets/blobstore_provider? - value: AzureRM -- type: replace - path: /instance_groups/name=scheduler/jobs/name=cloud_controller_clock/properties/cc/droplets/connection_config? - value: - provider: AzureRM - environment: ((environment)) - azure_storage_account_name: ((blobstore_storage_account_name)) - azure_storage_access_key: ((blobstore_storage_access_key)) - container_name: ((droplet_directory_key)) -- type: remove - path: /instance_groups/name=scheduler/jobs/name=cloud_controller_clock/properties/cc/droplets/fog_connection? - -- type: replace - path: /instance_groups/name=scheduler/jobs/name=cloud_controller_clock/properties/cc/packages/blobstore_type? - value: storage-cli -- type: replace - path: /instance_groups/name=scheduler/jobs/name=cloud_controller_clock/properties/cc/packages/blobstore_provider? - value: AzureRM -- type: replace - path: /instance_groups/name=scheduler/jobs/name=cloud_controller_clock/properties/cc/packages/connection_config? - value: - provider: AzureRM - environment: ((environment)) - azure_storage_account_name: ((blobstore_storage_account_name)) - azure_storage_access_key: ((blobstore_storage_access_key)) - container_name: ((app_package_directory_key)) -- type: remove - path: /instance_groups/name=scheduler/jobs/name=cloud_controller_clock/properties/cc/packages/fog_connection? - -- type: replace - path: /instance_groups/name=scheduler/jobs/name=cloud_controller_clock/properties/cc/resource_pool/blobstore_type? - value: storage-cli -- type: replace - path: /instance_groups/name=scheduler/jobs/name=cloud_controller_clock/properties/cc/resource_pool/blobstore_provider? - value: AzureRM -- type: replace - path: /instance_groups/name=scheduler/jobs/name=cloud_controller_clock/properties/cc/resource_pool/connection_config? - value: - provider: AzureRM - environment: ((environment)) - azure_storage_account_name: ((blobstore_storage_account_name)) - azure_storage_access_key: ((blobstore_storage_access_key)) - container_name: ((resource_directory_key)) -- type: remove - path: /instance_groups/name=scheduler/jobs/name=cloud_controller_clock/properties/cc/resource_pool/fog_connection? diff --git a/ci/pipeline.yml b/ci/pipeline.yml index 237c72b..269a350 100644 --- a/ci/pipeline.yml +++ b/ci/pipeline.yml @@ -1162,7 +1162,6 @@ jobs: cf-deployment-operations/seed-credhub-asg.yml cf-deployment-operations/seed-uaa-asg.yml cf-deployment-operations/tag-bbl-env.yml - cf-deployment-operations/use-azure-storage-cli.yml cf-deployment-operations/configure-blobstore-benchmark-fog-errand.yml cf-deployment-operations/configure-blobstore-benchmark-storage-cli-errand.yml - task: deploy @@ -1182,7 +1181,7 @@ jobs: base-ops-files/operations/use-compiled-releases.yml base-ops-files/operations/use-postgres.yml base-ops-files/operations/use-external-blobstore.yml - use-azure-storage-cli.yml + base-ops-files/operations/use-azure-storage-blobstore.yml configure-blobstore-benchmark-fog-errand.yml configure-blobstore-benchmark-storage-cli-errand.yml use-latest-capi.yml