Skip to content

fix ssl location #661

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

Merged
merged 1 commit into from
May 10, 2017
Merged

fix ssl location #661

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 0 additions & 3 deletions ansible/delta-hosts/variables
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,9 +145,6 @@ aws_secret_access_key=GrOO85hfoc7+bwT2GjoWbLyzyNbOKb2/XOJbCJsv
[starlord:vars]
starlord_vault_token=319ff979-b066-87c7-1172-6f3b5305d749

[swarm-manager:vars]
environment_name=delta

[user-vault:vars]
user_vault_s3_access_key=AKIAJRB2ERCOLHGNYAFQ
user_vault_s3_secret_key=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
Expand Down
3 changes: 0 additions & 3 deletions ansible/gamma-hosts/variables
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,9 +123,6 @@ aws_secret_access_key=GrOO85hfoc7+bwT2GjoWbLyzyNbOKb2/XOJbCJsv
[starlord:vars]
starlord_vault_token=8d6b414a-2e6d-65fb-f0b8-c6200ae688ad

[swarm-manager:vars]
environment_name=gamma

[user-vault:vars]
user_vault_s3_access_key=AKIAIOTM4MKOJJVUL7IQ
user_vault_s3_secret_key=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
Expand Down
4 changes: 2 additions & 2 deletions ansible/group_vars/alpha-swarm-manager-metrics.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ container_envs:
- name: AWS_SECRET_KEY
value: "{{ aws_secret_key }}"
- name: DOCKER_CERT_PATH
value: "/opt/ssl/docker/swarm-manager"
value: "/etc/ssl/docker"
- name: ENVIRONMENT
value: "{{ environment_name }}"
value: "{{ env }}"
- name: SWARM_HOSTNAME
value: "{{ swarm_host_address }}"
- name: SWARM_PORT
Expand Down
4 changes: 2 additions & 2 deletions ansible/k8/delta/swarm-cloudwatch-reporter/crons/swarm-cloudwatch-reporter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ spec:
volumeMounts:
- name: swarm-cloudwatch-reporter-docker-ssl-certs
mountPath: /etc/ssl/docker
image: quay.io/runnable/furry-cactus:master
image: quay.io/runnable/furry-cactus:v2.0.0
env:
- name: DATADOG_HOST
valueFrom:
Expand All @@ -33,7 +33,7 @@ spec:
- name: AWS_SECRET_KEY
value: "wgJ8gIKbe6dEpJxJHx8tnVWVWRMP8AhrLtOfWNsZ"
- name: DOCKER_CERT_PATH
value: "/opt/ssl/docker/swarm-manager"
value: "/etc/ssl/docker"
- name: ENVIRONMENT
value: "delta"
- name: SWARM_HOSTNAME
Expand Down
2 changes: 1 addition & 1 deletion ansible/k8/gamma/swarm-cloudwatch-reporter/crons/swarm-cloudwatch-reporter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ spec:
- name: AWS_SECRET_KEY
value: "wgJ8gIKbe6dEpJxJHx8tnVWVWRMP8AhrLtOfWNsZ"
- name: DOCKER_CERT_PATH
value: "/opt/ssl/docker/swarm-manager"
value: "/etc/ssl/docker"
- name: ENVIRONMENT
value: "gamma"
- name: SWARM_HOSTNAME
Expand Down