Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add dock subnet cidr to kubernetes load balancers for consul and vault #707

Open
wants to merge 2 commits into
base: self-host-part-2
Choose a base branch
from
+4 −1
Open

Add dock subnet cidr to kubernetes load balancers for consul and vault #707

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e261a94
Add dock subnet cidr to kubernetes load balancers for consul and vault
Jul 7, 2017
f90cf59
Add explicit subnet value to vars
Jul 7, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ansible/dock.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
name={{ dock }}
groups=dock

- include: image-builder.yml git_branch="v4.6.0"
- include: image-builder.yml git_branch="v4.6.2"

- hosts: "{{ dock }}"
tasks:
Expand Down
1 change: 1 addition & 0 deletions ansible/group_vars/all.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ jobs_path: "{{ opts_root }}/jobs"
cron_jobs_path: "{{ opts_root }}/crons"
volumes_path: "{{ opts_root }}/volumes"
daemon_sets_path: "{{ opts_root }}/daemonSets"
dock_subnet_cidr: "{{ dock_subnet_cidr }}"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do you have this here?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

temporarily, if they wanted to pass it in on the command line


container_tag: "{{ git_branch }}"
# registry settings
Expand Down
1 change: 1 addition & 0 deletions ansible/group_vars/alpha-consul-single.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@ container_tag: v0.6.4
container_run_args: consul agent -server -client=0.0.0.0 -bootstrap-expect=1 -data-dir=/tmp/db -ui

service_type: "LoadBalancer"
service_load_balancer_ranges: ["{{ dock_subnet_cidr }}"]
1 change: 1 addition & 0 deletions ansible/group_vars/alpha-vault-single.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ add_capabilities:
- IPC_LOCK

service_type: "LoadBalancer"
service_load_balancer_ranges: ["{{ dock_subnet_cidr }}"]

# Describes policy needed by Vault to create IAM users for orgs to get their org ids
# Docks will not come up if policy is incorrect
Expand Down