Rename instance group from 'windows-cell' to 'windows2012R2-cell' to …

…support various versions of Windows

Signed-off-by: Sebastian Vidrio <svidrio@pivotal.io>

cf-deployment.yml

@@ -51,6 +51,11 @@ addons:
           deployment: cf
           network: default
           domain: bosh
+        - query: '_'
+          instance_group: windows2012R2-cell
+          deployment: cf
+          network: default
+          domain: bosh
         - query: '_'
           instance_group: windows2016-cell
           deployment: cf

operations/README.md

@@ -46,7 +46,7 @@ This is the README for Ops-files. To learn more about `cf-deployment`, go to the
 | [`enable-uniq-consul-node-name.yml`](enable-uniq-consul-node-name.yml) | **DEPRECATED: Consul has been removed from cf-deployment** Configure Diego cell `consul_agent` jobs to have a unique id per instance. |  |
 | [`migrate-cf-mysql-to-pxc.yml`](migrate-cf-mysql-to-pxc.yml) | [Migrates](https://github.com/cloudfoundry-incubator/pxc-release#migrating-from-cf-mysql-release) from an existing cf-mysql database to pxc-release. After the migration is complete, switch to the `use-pxc.yml` operations file. | |
 | [`override-app-domains.yml`](override-app-domains.yml) | Switches from using the system domain as a shared app domain; allows the configuration of one or more shared app domains instead. | Adds [new variables](example-vars-files/vars-override-app-domains.yml).<br/> **CAUTION:** Seeding domains with a router group name (including TCP domains) may cause problems deploying. Please use the `cf` CLI to add shared domains with router group names. |
-| [`rename-network-and-deployment.yml`](rename-network-and-deployment.yml) | Allows a deployer to rename the network and deployment by passing a variables `network_name` and `deployment_name` | **CAUTION:** If you are using this ops file along  with another ops file that increases the number of instance groups (e.g. `windows-cell.yml` or `perm-services.yml`), this ops file will not rename the network for those instance groups. |
+| [`rename-network-and-deployment.yml`](rename-network-and-deployment.yml) | Allows a deployer to rename the network and deployment by passing a variables `network_name` and `deployment_name` | **CAUTION:** If you are using this ops file along  with another ops file that increases the number of instance groups (e.g. `windows2012R2-cell.yml` or `perm-services.yml`), this ops file will not rename the network for those instance groups. |
 | [`scale-database-cluster.yml`](scale-database-cluster.yml) | Scales cf-deployment database to 3 nodes across 3 zones (z1, z2, z3). | Cannot be used with postgres as it will not scale. |
 | [`scale-to-one-az.yml`](scale-to-one-az.yml) | Scales cf-deployment down to a single instance per instance group, placing them all into a single AZ. | Effectively halves the deployment's footprint. Should be applied before other ops files. |
 | [`set-bbs-active-key.yml`](set-bbs-active-key.yml) | Allows a deployer to set the `bbs` active key label by passing a variable `diego_bbs_active_key_label` |  |
@@ -59,11 +59,13 @@ This is the README for Ops-files. To learn more about `cf-deployment`, go to the
 | [`use-haproxy.yml`](use-haproxy.yml) | Deploys a single haproxy instance to be used as a load balancer. | This opsfile doesn't depend on use of an IaaS VIP and doesn't use `keepalived` property of the [haproxy-boshrelease](https://github.com/cloudfoundry-incubator/haproxy-boshrelease). |
 | [`use-haproxy-public-network.yml`](use-haproxy-public-network.yml) | Puts haproxy instance on a public network with a static IP assigned to it. | Requires `use-haproxy.yml`. This ops file also requires your BOSH cloud-config to have a `vm_extension` called `cf-haproxy-network-properties`, which configures firewall rules to allow public traffic on the necessary ports (You will need to allow at least the default HTTP and HTTPS ports (`80` and `443`), port `4443` for `doppler`, as well as the [port range configured for the TCP Routing](https://github.com/cloudfoundry/cf-deployment/blob/a6983a1b3345cd9f5af0f26d5c10265de0c7851f/cf-deployment.yml#L726)). |
 | [`use-latest-stemcell.yml`](use-latest-stemcell.yml) | Use the latest stemcell available on your BOSH director instead of the one in `cf-deployment.yml`. **Caution**: This ops-file should not be used in conjunction with `use-compiled-releases.yml`, since the latter relies on a specific stemcell version being used. |  |
-| [`use-latest-windows-stemcell.yml`](use-latest-windows-stemcell.yml) | Use the latest `windows2012R2` stemcell available on your BOSH director instead of the one in `windows-cell.yml` | Requires `windows-cell.yml` |
+| [`use-latest-windows-stemcell.yml`](use-latest-windows-stemcell.yml) | **DEPRECATED** Use `use-latest-windows2012R2-stemcell.yml` instead. | |
+| [`use-latest-windows2012R2-stemcell.yml`](use-latest-windows2012R2-stemcell.yml) | Use the latest `windows2012R2` stemcell available on your BOSH director instead of the one in `windows2012R2-cell.yml` | Requires `windows2012R2-cell.yml` |
 | [`use-postgres.yml`](use-postgres.yml) | Replaces the MySQL instance group with a postgres instance group. **Warning**: this will lead to total data loss if applied to an existing deployment with MySQL or removed from an existing deployment with postgres. |  |
 | [`use-pxc.yml`](use-pxc.yml) | Uses the [pxc-release](https://github.com/cloudfoundry-incubator/pxc-release) instead of the [cf-mysql-release](https://github.com/cloudfoundry/cf-mysql-release/) as the internal mysql database. This ops-file is for clean-installs of CF or for redeploying CF already running pxc. If migrating, please use `migrate-cf-mysql-to-pxc.yml`. | |
 | [`use-trusted-ca-cert-for-apps.yml`](use-trusted-ca-cert-for-apps.yml) | Injects the CA specified with `trusted_cert_for_apps` into the Diego `rep` job's trust store and cf-deployment's default root filesystem | Applications that *explicitly* look in the canonical location (`/etc/cf-system-certificates`) will trust certificates signed by the given CA, regardless of filesystem. Applications that use the default root filesystem will trust certificates signed by the given CA *implicitly*. <br/> Please see the [documentation](https://docs.cloudfoundry.org/running/trusted-system-certificates.html) for information about configuring additional trusted CA certificates. |
-| [`windows-cell.yml`](windows-cell.yml) | Deploys a Windows 2012R2 Diego cell and adds releases necessary for Windows. | **Known issue**: Windows cells deployed to AWS will likely have their disks fill up after ~9 days (depending on load). The bosh-windows team is actively working on a fix for this. Operators who want to deploy windows cells to AWS anyway may want to recreate those cells periodically.  |
+| [`windows-cell.yml`](windows-cell.yml) | **DEPERECATED** Use `windows2012R2-cell.yml` instead. | |
+| [`windows2012R2-cell.yml`](windows2012R2-cell.yml) | Deploys a Windows 2012R2 Diego cell and adds releases necessary for Windows. | **Known issue**: Windows cells deployed to AWS will likely have their disks fill up after ~9 days (depending on load). The bosh-windows team is actively working on a fix for this. Operators who want to deploy windows cells to AWS anyway may want to recreate those cells periodically.  |
 | [`use-latest-windows2016-stemcell.yml`](use-latest-windows2016-stemcell.yml) | Use the latest `windows2016` stemcell available on your BOSH director instead of the one in `windows2016-cell.yml` | Requires `windows2016-cell.yml` |
 | [`use-offline-windows2016fs.yml`](use-offline-windows2016fs.yml) | Use the offline version of [windows2016fs-release](https://github.com/cloudfoundry-incubator/windows2016fs-release) | Requires `windows2016-cell.yml`. Suitable for environments without internet access. Follow instructions [here](https://github.com/cloudfoundry-incubator/windows2016fs-release/blob/master/README.md) to upload the release prior to deploying. |
 | [`windows2016-cell.yml`](windows2016-cell.yml) | Deploys a windows 2016 diego cell, adds releases necessary for windows. | Windows2016 stemcell is currently only supported on GCP and Azure. AWS support is currently under development. |

operations/rename-network-and-deployment.yml

@@ -85,7 +85,7 @@
       network: ((network_name))
       domain: bosh
     - query: '_'
-      instance_group: windows-cell
+      instance_group: windows2012R2-cell
       deployment: ((deployment_name))
       network: ((network_name))
       domain: bosh

operations/use-latest-windows-stemcell.yml

@@ -0,0 +1 @@
+use-latest-windows2012R2-stemcell.yml

operations/use-latest-windows2012R2-stemcell.yml

@@ -0,0 +1,3 @@
+- path: /stemcells/alias=windows2012R2/version
+  type: replace
+  value: latest

operations/windows-cell.yml

@@ -0,0 +1 @@
+windows2012R2-cell.yml

operations/windows2012R2-cell.yml

@@ -0,0 +1,136 @@
+- type: replace
+  path: /instance_groups/-
+  value:
+    azs:
+    - z1
+    - z2
+    instances: 1
+    jobs:
+    - name: garden-windows
+      properties:
+        garden:
+          max_container_procs: 20
+        syslog_daemon_config:
+          enable: false
+      release: garden-windows
+    - name: rep_windows
+      properties:
+        containers:
+          trusted_ca_certificates:
+          - ((application_ca.certificate))
+          - ((credhub_ca.certificate))
+          - ((uaa_ca.certificate))
+        diego:
+          executor:
+            instance_identity_ca_cert: ((diego_instance_identity_ca.certificate))
+            instance_identity_key: ((diego_instance_identity_ca.private_key))
+          rep:
+            preloaded_rootfses:
+            - windows2012R2:/tmp/windows2012R2
+        enable_declarative_healthcheck: true
+        logging:
+          format:
+            timestamp: rfc3339
+        loggregator:
+          ca_cert: ((loggregator_ca.certificate))
+          cert: ((loggregator_tls_agent.certificate))
+          key: ((loggregator_tls_agent.private_key))
+          use_v2_api: true
+        syslog_daemon_config:
+          enable: false
+        tls:
+          ca_cert: ((service_cf_internal_ca.certificate))
+          cert: ((diego_rep_agent_v2.certificate))
+          key: ((diego_rep_agent_v2.private_key))
+      release: diego
+    - name: route_emitter_windows
+      properties:
+        diego:
+          route_emitter:
+            bbs:
+              ca_cert: ((service_cf_internal_ca.certificate))
+              client_cert: ((diego_bbs_client.certificate))
+              client_key: ((diego_bbs_client.private_key))
+            local_mode: true
+        logging:
+          format:
+            timestamp: rfc3339
+        loggregator:
+          ca_cert: ((loggregator_ca.certificate))
+          cert: ((loggregator_tls_agent.certificate))
+          key: ((loggregator_tls_agent.private_key))
+          use_v2_api: true
+        tcp:
+          enabled: true
+        uaa:
+          ca_cert: ((uaa_ca.certificate))
+          client_secret: ((uaa_clients_tcp_emitter_secret))
+      release: diego
+    - name: loggregator_agent_windows
+      properties:
+        disable_udp: true
+        loggregator:
+          tls:
+            agent:
+              cert: ((loggregator_tls_agent.certificate))
+              key: ((loggregator_tls_agent.private_key))
+            ca_cert: ((loggregator_ca.certificate))
+        syslog_daemon_config:
+          enable: false
+      release: loggregator-agent
+    - name: enable_ssh
+      release: windows-utilities
+    name: windows2012R2-cell
+    networks:
+    - name: default
+    stemcell: windows2012R2
+    vm_extensions:
+    - 100GB_ephemeral_disk
+    vm_type: small-highmem
+- type: replace
+  path: /releases/-
+  value:
+    name: garden-windows
+    sha1: f678d11039d0719b100c45321057dca0788f92dd
+    url: https://bosh.io/d/github.com/cloudfoundry-incubator/garden-windows-bosh-release?v=0.14.0
+    version: 0.14.0
+- type: replace
+  path: /releases/name=windows-utilities?
+  value:
+    name: windows-utilities
+    sha1: efc10ac0f4acae23637ce2c6f864d20df2e3a781
+    url: https://bosh.io/d/github.com/cloudfoundry-incubator/windows-utilities-release?v=0.11.0
+    version: 0.11.0
+- type: replace
+  path: /stemcells/-
+  value:
+    alias: windows2012R2
+    os: windows2012R2
+    version: "1200.24"
+- type: replace
+  path: /instance_groups/name=api/jobs/name=cloud_controller_ng/properties/cc/stacks/name=windows2012R2?
+  value:
+    description: Windows Server 2012 R2
+    name: windows2012R2
+- type: replace
+  path: /instance_groups/name=api/jobs/name=cloud_controller_ng/properties/cc/install_buildpacks/name=hwc_buildpack?
+  value:
+    name: hwc_buildpack
+    package: hwc-buildpack
+- type: replace
+  path: /instance_groups/name=api/jobs/name=hwc-buildpack?
+  value:
+    name: hwc-buildpack
+    release: hwc-buildpack
+- type: replace
+  path: /instance_groups/name=api/jobs/name=cloud_controller_ng/properties/cc/install_buildpacks/-
+  value:
+    name: binary_buildpack
+    package: binary-buildpack-windows2012R2
+- type: replace
+  path: /releases/name=hwc-buildpack?
+  value:
+    name: hwc-buildpack
+    sha1: 397491396861195f90c53b4126283e37f14bdb5f
+    url: https://bosh.io/d/github.com/cloudfoundry-incubator/hwc-buildpack-release?v=3.0.2
+    version: 3.0.2

scripts/test-experimental-ops.sh

@@ -16,7 +16,7 @@ test_experimental_ops() {
 
       check_interpolation "disable-consul.yml"
       check_interpolation "name: disable-consul-bosh-lite.yml" "disable-consul.yml" "-o ${home}/operations/bosh-lite.yml" "-o disable-consul-bosh-lite.yml"
-      check_interpolation "name: disable-consul-windows.yml" "${home}/operations/windows-cell.yml" "-o disable-consul.yml" "-o disable-consul-windows.yml"
+      check_interpolation "name: disable-consul-windows.yml" "${home}/operations/windows2012R2-cell.yml" "-o disable-consul.yml" "-o disable-consul-windows.yml"
       check_interpolation "name: disable-consul-windows2016.yml" "${home}/operations/windows2016-cell.yml" "-o disable-consul.yml" "-o disable-consul-windows2016.yml"
       check_interpolation "name: disable-consul-windows1803.yml" "windows1803-cell.yml" "-o disable-consul.yml" "-o disable-consul-windows1803.yml"
       check_interpolation "disable-interpolate-service-bindings.yml"