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

Install Registry by Default #2475

Merged
merged 4 commits into from Sep 30, 2016
Merged

Conversation

smunilla
Copy link
Contributor

@smunilla smunilla commented Sep 20, 2016

Instead of restricting cockpit-ui to Atomic Registry installations, install it by default everywhere. deployment_subtype=registry is no longer required to deploy the Atomic Registry but can be used to create a standalone registry deployment (no web console, etc). This requires securing the registry by default.

Any users maintaining their own registry and/or users which don't want to deploy Atomic Registry may disable management of the registry by adding the following variable to their inventory.

openshift_hosted_manage_registry=false

@smunilla
Copy link
Contributor Author

@abutcher PTAL

@smunilla
Copy link
Contributor Author

aos-ci-test

@smunilla
Copy link
Contributor Author

CI isn't landing the registry right. Time to figure out what's up.

@smunilla smunilla changed the title Install Registry by Default [WIP] Install Registry by Default Sep 20, 2016
@abutcher
Copy link
Member

@smunilla Looks like the image may be missing from our configured registries. /cc @sdodson

@abutcher
Copy link
Member

Nevermind, the template probably wasn't created.

@smunilla smunilla force-pushed the registry_all_the_time branch 2 times, most recently from aed95bc to 45085e5 Compare September 21, 2016 14:45
@smunilla
Copy link
Contributor Author

aos-ci-test

@smunilla
Copy link
Contributor Author

aos-ci-test

@smunilla
Copy link
Contributor Author

aos-ci-test

@smunilla smunilla changed the title [WIP] Install Registry by Default Install Registry by Default Sep 23, 2016
@smunilla
Copy link
Contributor Author

aos-ci-test

@smunilla
Copy link
Contributor Author

@sdodson Mind looking this over?

@openshift-bot
Copy link

@@ -0,0 +1,128 @@
---
- name: Configure CA certificate for secure registry
Copy link
Contributor

Choose a reason for hiding this comment

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

I'd like to see this logic pushed down into a role, rather than a playbook. Ideally, we'd be able to apply this as part of the node/docker config.

@abutcher maybe we need to deploy the registry prior to configuring the nodes, that would provide the needed info for node configuration.

Copy link
Member

Choose a reason for hiding this comment

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

@detiber We only need to know the service IP and route here so that should work.

Copy link
Member

Choose a reason for hiding this comment

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

This playbook is gone now that we're adding the OpenShift CA to the system trusted roots for each node.

@smunilla
Copy link
Contributor Author

aos-ci-test

@openshift-bot
Copy link

@abutcher abutcher mentioned this pull request Sep 28, 2016
smunilla and others added 3 commits September 29, 2016 15:12
Instead of restricting cockpit-ui to Atomic Registry installations,
install it by default everywhere.

Fixes Bug 1371459
* Convert oc template calls to jsonpath.
* Wait for deployments to finish before restarting docker.
* Re-organize node ca configuration.
@abutcher
Copy link
Member

@sdodson PTAL when ya can

- Default to hosted_registry_insecure=False
- Add openshift ca to system ca-trust.
- Update ca trust in openshift_node_certificates rather than docker_ca_trust
@abutcher
Copy link
Member

aos-ci-test

@openshift-bot
Copy link

Copy link
Member

@sdodson sdodson left a comment

Choose a reason for hiding this comment

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

sorry for the late review, looks good to me

@sdodson sdodson merged commit 5746c82 into openshift:master Sep 30, 2016
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.

None yet

5 participants