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.

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

Allowing a wildcard cert to be generated. #3821

Merged
merged 1 commit into from
Apr 5, 2017

Conversation

kwoodson
Copy link
Contributor

No description provided.

@kwoodson
Copy link
Contributor Author

@enoodle, opened PR here in place of #3749

@mtnbikenc
Copy link
Member

I'm back and forth on doing the task file include in the block. Since there are only two tasks, it seems reasonable to just put them in the router.yml vice a separate task file. The block functions the same either way. Travis is complaining about yamllint in that new file.

# keep the logic in this playbook on how to handle certificates.
- block:
- include: wildcard_router_cert.yml
when: openshift_hosted_router_create_certificate | default(false)
Copy link
Member

Choose a reason for hiding this comment

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

Is the default needed here since it is in defaults/main.yml? If so, then it seems it should also be at line 32.

Copy link
Contributor

@enoodle enoodle left a comment

Choose a reason for hiding this comment

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

LGTM, pending the comment about the "when" which will prevent the tests from passing, too.

certfile: "{{ openshift_master_config_dir ~ '/openshift-router.crt' }}"
keyfile: "{{ openshift_master_config_dir ~ '/openshift-router.key' }}"
cafile: "{{ openshift_master_config_dir ~ '/ca.crt' }}"
when: openshift_hosted_router_create_certificate
Copy link
Contributor

Choose a reason for hiding this comment

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

ansible complained about this line. I think it should be indented once and maybe lowered to be clear that it applies to both tasks in the block.

Copy link
Member

@mtnbikenc mtnbikenc left a comment

Choose a reason for hiding this comment

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

👍

@kwoodson
Copy link
Contributor Author

kwoodson commented Apr 4, 2017

@mtnbikenc, thanks. Travis failed on yamllint on py27 but not py35. I changed spacing again. I will pass the tests and then squash these commits.

@kwoodson kwoodson force-pushed the default_router_cert branch from a1316e7 to cd595ca Compare April 4, 2017 15:17
@kwoodson
Copy link
Contributor Author

kwoodson commented Apr 4, 2017

aos-ci-test

1 similar comment
@kwoodson
Copy link
Contributor Author

kwoodson commented Apr 4, 2017

aos-ci-test

@kwoodson
Copy link
Contributor Author

kwoodson commented Apr 4, 2017

[test]

@openshift-bot
Copy link

success: aos-ci-jenkins/OS_unit_tests for cd595ca (logs)

@openshift-bot
Copy link

Evaluated for openshift ansible test up to cd595ca

@openshift-bot
Copy link

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

@openshift-bot
Copy link

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

@openshift-bot
Copy link

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

@openshift-bot
Copy link

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

@openshift-bot
Copy link

continuous-integration/openshift-jenkins/test FAILURE (https://ci.openshift.redhat.com/jenkins/job/test_pull_request_openshift_ansible_extended_conformance_install/112/) (Base Commit: 76be31c)

@sdodson
Copy link
Member

sdodson commented Apr 4, 2017

[merge]

@openshift-bot
Copy link

success: aos-ci-jenkins/OS_unit_tests for cd595ca (logs)

@openshift-bot
Copy link

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

@openshift-bot
Copy link

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

@openshift-bot
Copy link

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

@openshift-bot
Copy link

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

@kwoodson
Copy link
Contributor Author

kwoodson commented Apr 5, 2017

flake openshift/origin#10162

@kwoodson
Copy link
Contributor Author

kwoodson commented Apr 5, 2017

[merge]

@openshift-bot
Copy link

Evaluated for openshift ansible merge up to cd595ca

@openshift-bot
Copy link

openshift-bot commented Apr 5, 2017

continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/merge_pull_request_openshift_ansible/165/) (Base Commit: 9b0f294)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants