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

Jump to bottom

update env in etcd.conf.j2 to reflect the latest naming #5277

Merged
merged 1 commit into from Sep 6, 2017
Merged

update env in etcd.conf.j2 to reflect the latest naming #5277

merged 1 commit into from Sep 6, 2017

Conversation

ingvagabund
Copy link
Member

@ingvagabund ingvagabund commented Aug 31, 2017 •
edited

Aligning envs in the etcd.conf.j2 with the latest envs [1] based on etcd-3.2.6 release.

Both ETCD_CA_FILE, resp. ETCD_PEER_CA_FILE are deprecated in favor of ETCD_TRUSTED_CA_FILE and ETCD_CLIENT_CERT_AUTH, resp. ETCD_PEER_CA_FILE and ETCD_PEER_CLIENT_CERT_AUTH.

[1] https://github.com/coreos/etcd/blob/9d43462d174c664f5edf313dec0de31e1ef4ed47/Documentation/op-guide/configuration.md

Fixes: 1473027

@ingvagabund
Copy link
Member Author

aos-ci-test

giuseppe
giuseppe reviewed Aug 31, 2017
View reviewed changes
roles/etcd/templates/etcd.conf.j2 Outdated
ETCD_PEER_CERT_FILE={{ etcd_peer_cert_file }}
ETCD_PEER_KEY_FILE={{ etcd_peer_key_file }}
{% endif -%}
#ETCD_PEER_TRUSTED_CA_FILE=""
Copy link
Member

Choose a reason for hiding this comment

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

should #ETCD_PEER_TRUSTED_CA_FILE="" be dropped since we give it a value some lines above?

Copy link
Member Author

Choose a reason for hiding this comment

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

Right, PR updated

@openshift-bot
Copy link

success: "aos-ci-jenkins/OS_3.6_NOT_containerized, aos-ci-jenkins/OS_3.6_NOT_containerized_e2e_tests" for b60188a (logs)

@openshift-bot
Copy link

success: "aos-ci-jenkins/OS_3.6_containerized, aos-ci-jenkins/OS_3.6_containerized_e2e_tests" for b60188a (logs)

@ashcrow
Copy link
Member

ashcrow commented Sep 1, 2017

aos-ci-test

@openshift-bot
Copy link

success: "aos-ci-jenkins/OS_3.6_NOT_containerized, aos-ci-jenkins/OS_3.6_NOT_containerized_e2e_tests" for 7c96c92 (logs)

@openshift-bot
Copy link

success: "aos-ci-jenkins/OS_3.6_containerized, aos-ci-jenkins/OS_3.6_containerized_e2e_tests" for 7c96c92 (logs)

@sdodson
Copy link
Member

sdodson commented Sep 5, 2017

flags all look good in 3.1 too so [merge]

@openshift-bot
Copy link

Evaluated for openshift ansible merge up to 7c96c92

@openshift-bot
Copy link

[test]ing while waiting on the merge queue

@openshift-bot
Copy link

Evaluated for openshift ansible test up to 7c96c92

@openshift-bot
Copy link

continuous-integration/openshift-jenkins/test SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pull_request_openshift_ansible/600/) (Base Commit: 91043b6) (PR Branch Commit: 7c96c92)

@openshift-bot
Copy link

continuous-integration/openshift-jenkins/merge FAILURE (https://ci.openshift.redhat.com/jenkins/job/merge_pull_request_openshift_ansible/984/) (Base Commit: 3384369) (PR Branch Commit: 7c96c92)

@sdodson
Copy link
Member

sdodson commented Sep 6, 2017

flake on openshift/origin#16023

@sdodson sdodson merged commit 89c5814 into openshift:master Sep 6, 2017
@ingvagabund ingvagabund deleted the update-env-in-etcd-conf branch September 11, 2017 10:19
@ingvagabund ingvagabund mentioned this pull request Sep 15, 2017
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ashcrow ashcrow ashcrow approved these changes

@sdodson sdodson sdodson approved these changes

@giuseppe giuseppe giuseppe approved these changes

Assignees
No one assigned
Labels
affects_3.6
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@ingvagabund @openshift-bot @ashcrow @sdodson @giuseppe @dlbewley