Skip to content

Commit

Permalink
add cloud config (#3)
Browse files Browse the repository at this point in the history 
* fix path and move to folder prefixed area

* use consistent paths for CPI-specific configuration

* Do not reduce director disks to 20GB in Softlayer CPI

20GB is not big enough for current cf-deployments.

* Add credhub security group to readme

* Hub

* adding ops file for external ip for mbus only (#191)

* Create disable.yml

* use localhost for ipv6 director->nats connectivity

* add 3541.x stemcell for compilatio

* Update cpi.yml

* Need to specify 127.0.0.1 for blobstore when dynamic IP

* Update iam-instance-profile.yml

* Update iam-instance-profile.yml

* Reserve 10.245.0.2-10.245.0.10 in docker cloud-config

When using the Docker BOSH CLI v2 container (bosh/cli2) to stand up a BOSH director and run through the Zookeeper deployment steps, the operator will run into the following issue:

```
Task 7 | 00:30:29 | Creating missing vms: zookeeper/eb92593f-e880-42f6-b696-31576ae5d613 (0)
Task 7 | 00:30:29 | Creating missing vms: zookeeper/1442654d-9562-4e9c-84ba-1c389d225304 (3)
Task 7 | 00:30:29 | Creating missing vms: zookeeper/39318440-d3c2-4997-b723-69259f51aaac (4)
Task 7 | 00:30:29 | Creating missing vms: zookeeper/b52a5562-e6a2-4145-a96d-84b7cb532ba1 (1)
Task 7 | 00:30:29 | Creating missing vms: zookeeper/c4c530be-3e36-4526-9bdb-bc4513b83a52 (2)
Task 7 | 00:31:23 | Creating missing vms: zookeeper/1442654d-9562-4e9c-84ba-1c389d225304 (3) (00:00:54)
                   L Error: CPI error 'Bosh::Clouds::CloudError' with message 'Creating VM with agent ID '{{803b7399-c39b-4cc1-bdb2-a55f2b3175
ed}}': Starting container: Error response from daemon: Address already in use' in 'create_vm' CPI method
Task 7 | 00:32:07 | Creating missing vms: zookeeper/c4c530be-3e36-4526-9bdb-bc4513b83a52 (2) (00:01:38)
Task 7 | 00:32:07 | Creating missing vms: zookeeper/b52a5562-e6a2-4145-a96d-84b7cb532ba1 (1) (00:01:38)
Task 7 | 00:32:07 | Creating missing vms: zookeeper/39318440-d3c2-4997-b723-69259f51aaac (4) (00:01:38)
Task 7 | 00:32:08 | Creating missing vms: zookeeper/eb92593f-e880-42f6-b696-31576ae5d613 (0) (00:01:39)
Task 7 | 00:32:11 | Error: CPI error 'Bosh::Clouds::CloudError' with message 'Creating VM with agent ID '{{803b7399-c39b-4cc1-bdb2-a55f2b3175e
d}}': Starting container: Error response from daemon: Address already in use' in 'create_vm' CPI method

Task 7 Started  Thu Mar  1 00:22:20 UTC 2018
Task 7 Finished Thu Mar  1 00:32:11 UTC 2018
Task 7 Duration 00:09:51
Task 7 error
```
This occurs because the cli2 container binds 10.245.0.3 during bosh create-env.  The 'expected' Docker networking (seen in run_checks.sh and the Docker cloud-config.yml) sets up 10.245.0.0/16 with the Director on 10.245.0.10, but doesn't reserve the CLI address to prevent a later conflict.  The example of a manual network provided at https://bosh.io/docs/networks.html gives a template for how to fix the issue:

```
...
    # IPs that will not be used for anything
    reserved: [10.245.0.2-10.245.0.10]
...

* Revert "use localhost for ipv6 director->nats connectivity"

This reverts commit bae0b7a.

* aws/iam-instance-profile.yml only applies to the director vm

* Create cli-iam-instance-profile.yml

* add internal ntp support

* Bump OpenStack CPI version

* Creating ops file to restrict nats to TLS connections

[#154666914]

Signed-off-by: Stu Pollock <spollock@pivotal.io>

* move nats-strict-tls.yml to misc/

* bump pipelines

* bump docker cpi to 0.0.4 to include multi cpi support

* add test azure/cpi-secondary* for multi cpi support

* add azure/cpi-secondary.yml and docker/cpi-secondary.yml

* rename external-ip-not-recommended-mbus-only.yml

* bump to bosh-dns 1.3.0

* bump pipelines

* Bump BPM to 0.5.0

See https://github.com/cloudfoundry-incubator/bpm-release/releases/tag/v0.5.0

Notably this bump fixes a bug in which BPM may not always function
properly after a VM reboot.

[#155790902](https://www.pivotaltracker.com/story/show/155790902)

* compile new assets

* bump bosh-vsphere-cpi to v47

* add a test for */cpi-secondary.yml for multi-cpi setup

* Ops-file to encrypt disks with aws kms key.

* Encrypted

* bump bosh to v265.2.0

* speed up vbox bosh-lite installation

* bump warden/cpi.yml to warden cpi v40

* added bbr

* change how warden cpi in warden/cpi.yml gets added

* Add virtualbox create/delete scripts

* Update VirtualBox create-env

 * automatically clone bosh-deployment if necessary
 * remove interactive confirmation prompt
 * add UAA
 * add CredHub and their environment variables
 * more noticeable step headers

* bump to bosh-docker-cpi 0.0.5

* `virtualbox/create-env.sh` can be run from any dir

* The script now locates `bosh-deployment` by its relative position,
   not by assuming that it should be a sub-directory of `${PWD}`.
* Stop cloning `bosh-deployment`, it already exists.
* Record the short git sha of `bosh-deployment` in .envrc as
   `BOSH_DEPLOYMENT_SHA`
* Additional fixes for `shellcheck` errors.

* add docker/ipv6/cpi.yml

Signed-off-by: Brian Cunnie <bcunnie@pivotal.io>

* modify bosh.yml for bosh-alicloud-cpi
add alicloud/cpi.yml

* add cloud-config.yml, support release 8 version
	modified:   alicloud/cpi.yml
	alicloud/cloud-config.yml

* add cloud-config.yml

* change stemcell version to 1008

* update cpi.yml to use cpi release 10, update cloud-config.yml

* support cpi-r10, stemcell 1010

* correct cpi-r10 sha1

* modify cpi and stemcell url to oss

* support stemcell version 1017

* Update iam-instance-profile.yml

*  support cpi release 18 and stemcell 1018 (#2)

* support cpi release 18 and stemcell 1018

* add cloud config
  • Loading branch information
@xiaozhu36
xiaozhu36 authored May 10, 2018
1 parent 3232904 commit ee6282d
Show file tree
Hide file tree
Showing 3 changed files with 129 additions and 2 deletions.
4 changes: 2 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
## Ops files

- `bosh.yml`: Base manifest that is meant to be used with different CPI configurations
- `[aws|azure|docker|gcp|openstack|softlayer|vcloud|vsphere|virtualbox]/cpi.yml`: CPI configuration
- `[aws|azure|docker|gcp|openstack|softlayer|vcloud|vsphere|virtualbox]/cloud-config.yml`: Simple cloud configs
- `[alicloud|aws|azure|docker|gcp|openstack|softlayer|vcloud|vsphere|virtualbox]/cpi.yml`: CPI configuration
- `[alicloud|aws|azure|docker|gcp|openstack|softlayer|vcloud|vsphere|virtualbox]/cloud-config.yml`: Simple cloud configs
- `jumpbox-user.yml`: Adds user `jumpbox` for SSH-ing into the Director (see [Jumpbox User](docs/jumpbox-user.md))
- `uaa.yml`: Deploys UAA and enables UAA user management in the Director
- `credhub.yml`: Deploys CredHub and enables CredHub integration in the Director
Expand Down
21 changes: 21 additions & 0 deletions alicloud/cloud-config-vars.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
az1_zone:
az1_vswitch_range:
az1_vswitch_gateway:
az1_vswitch_id:

az2_zone:
az2_vswitch_range:
az2_vswitch_gateway:
az2_vswitch_id:

az3_zone:
az3_vswitch_range:
az3_vswitch_gateway:
az3_vswitch_id:

security_group_id_1:
security_group_id_2:
security_group_id_3:

http_slb_id_array: []
tcp_slb_id_array: []
106 changes: 106 additions & 0 deletions alicloud/cloud-config.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,106 @@
azs:
- name: z1
cloud_properties:
availability_zone: ((az1_zone))
- name: z2
cloud_properties:
availability_zone: ((az2_zone))
- name: z3
cloud_properties:
availability_zone: ((az3_zone))

vm_types:
- name: minimal
cloud_properties:
instance_type: ecs.mn4.small
ephemeral_disk: {size: "51_200"}
- name: small
cloud_properties:
instance_type: ecs.sn2.medium
ephemeral_disk: {size: "51_200"}
- name: default
cloud_properties:
instance_type: ecs.sn2.medium
ephemeral_disk: {size: "51_200"}
- name: small-highmem
cloud_properties:
instance_type: ecs.sn2ne.xlarge
ephemeral_disk: {size: "51_200"}
- name: compiler
cloud_properties:
instance_type: ecs.sn1.large
ephemeral_disk: {size: "51_200"}

disk_types:
- name: 5GB
disk_size: 20_480
- name: 10GB
disk_size: 20_480
- name: 100GB
disk_size: 102_400

vm_extensions:
- name: 5GB_ephemeral_disk
cloud_properties:
ephemeral_disk: {size: "20_480"}
- name: 10GB_ephemeral_disk
cloud_properties:
ephemeral_disk: {size: "20_480"}
- name: 50GB_ephemeral_disk
cloud_properties:
ephemeral_disk: {size: "50_120"}
- name: 100GB_ephemeral_disk
cloud_properties:
ephemeral_disk: {size: "102_400"}
- name: 500GB_ephemeral_disk
cloud_properties:
ephemeral_disk: {size: "512_000"}
- name: 1TB_ephemeral_disk
cloud_properties:
ephemeral_disk: {size: "1024_000"}
- name: cf-router-network-properties
cloud_properties:
slbs: ((http_slb_id_array))
- name: cf-tcp-router-network-properties
cloud_properties:
slbs: ((tcp_slb_id_array))
- name: diego-ssh-proxy-network-properties

networks:
- name: default
type: manual
subnets:
- range: ((az1_vswitch_range))
gateway: ((az1_vswitch_gateway))
az: z1
dns: [8.8.8.8]
cloud_properties:
vswitch_id: ((az1_vswitch_id))
security_group_ids:
- ((security_group_id_1))
- ((security_group_id_2))
- range: ((az2_vswitch_range))
gateway: ((az2_vswitch_gateway))
az: z2
dns: [8.8.8.8]
cloud_properties:
vswitch_id: ((az2_vswitch_id))
security_group_ids:
- ((security_group_id_1))
- ((security_group_id_2))
- range: ((az3_vswitch_range))
gateway: ((az3_vswitch_gateway))
az: z3
dns: [8.8.8.8]
cloud_properties:
vswitch_id: ((az3_vswitch_id))
security_group_ids: [((security_group_id_3))]
- name: vip
type: vip

compilation:
workers: 5
reuse_compilation_vms: true
az: z1
vm_type: compiler
network: default

0 comments on commit ee6282d

Please sign in to comment.