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

Redeploy catalog/broker certs by default #11704

Merged
merged 1 commit into from Jun 19, 2019

Conversation

fabianvf
Copy link
Member

For installation, Service Catalog, Ansible Service Broker, and Template Service Broker all default to enabled, so they should default to enabled when redeploying certificates as well (otherwise when using the same inventory the catalog/brokers will go from a working state to a broken state). The Service Catalog certs should be redeployed whether or not the brokers are enabled.

Also removes unused tasks that cause variable collision with the etcd role, as if the ansible-service-broker role is included before the etcd role is run (for example, if you're chaining the asb install + redeploy_certificates playbooks) the etcd role will write in invalid openssl.cnf.

Follow-up to #11681 which fixed the majority of the issues.

@fabianvf fabianvf requested a review from jcpowermac June 19, 2019 17:30
@openshift-ci-robot openshift-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Jun 19, 2019
@jcpowermac
Copy link
Contributor

Thanks @fabianvf
Can you squash and I will lgtm once testing passes.

For installation, Service Catalog, Ansible Service Broker,
    and Template Service Broker all default to enabled,
    so they should default to enabled when redeploying
    certificates as well. The Service Catalog certs should
    be redeployed whether or not the brokers are enabled.

Also remove unused tasks that cause variable collision with the etcd role
@fabianvf
Copy link
Member Author

/test e2e-gcp

1 similar comment
@jcpowermac
Copy link
Contributor

/test e2e-gcp

@jcpowermac
Copy link
Contributor

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jun 19, 2019
@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: fabianvf, jcpowermac

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 19, 2019
@openshift-merge-robot openshift-merge-robot merged commit b8d96f9 into openshift:release-3.11 Jun 19, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants