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

Make openshift_hosted_registry_console opt-out #3825

Closed
wants to merge 2 commits into from
Closed

Make openshift_hosted_registry_console opt-out #3825

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e25214b
Make cockpit-ui disablable
sdodson Mar 31, 2017
bcff466
rename cockpit-ui -> openshift_hosted_registry_console
sdodson Mar 31, 2017
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
6 changes: 4 additions & 2 deletions inventory/byo/hosts.origin.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,9 +363,11 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true',
# OpenShift Registry Console Options
# Override the console image prefix for enterprise deployments, not used in origin
# default is "registry.access.redhat.com/openshift3/" and the image appended is "registry-console"
#openshift_cockpit_deployer_prefix=registry.example.com/myrepo/
#openshift_hosted_registry_console_deployer_prefix=registry.example.com/myrepo/
# Override image version, defaults to latest for origin, matches the product version for enterprise
#openshift_cockpit_deployer_version=1.4.1
#openshift_hosted_registry_console_deployer_version=1.4.1
# Disable deployment of the registry console (cockpit)
#openshift_hosted_registry_console_deploy=false

# Openshift Registry Options
#
Expand Down
6 changes: 4 additions & 2 deletions inventory/byo/hosts.ose.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,9 +363,11 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true',
# OpenShift Registry Console Options
# Override the console image prefix for enterprise deployments, not used in origin
# default is "registry.access.redhat.com/openshift3/" and the image appended is "registry-console"
#openshift_cockpit_deployer_prefix=registry.example.com/myrepo/
#openshift_hosted_registry_console_deployer_prefix=registry.example.com/myrepo/
# Override image version, defaults to latest for origin, matches the product version for enterprise
#openshift_cockpit_deployer_version=1.4.1
#openshift_hosted_registry_console_deployer_version=1.4.1
# Disable deployment of the registry console (cockpit)
#openshift_hosted_registry_console_deploy=false

# Openshift Registry Options
#
Expand Down
9 changes: 7 additions & 2 deletions playbooks/common/openshift-cluster/openshift_hosted.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,13 @@
openshift_hosted_logging_elasticsearch_ops_pvc_size: "{{ openshift.hosted.logging.storage.volume.size if openshift_hosted_logging_storage_kind | default(none) in ['dynamic','nfs' ] else '' }}"
openshift_hosted_logging_elasticsearch_ops_pvc_prefix: "{{ 'logging-es-ops' if openshift_hosted_loggingops_storage_kind | default(none) =='dynamic' else '' }}"

- role: cockpit-ui
when: ( openshift.common.version_gte_3_3_or_1_3 | bool ) and ( openshift_hosted_manage_registry | default(true) | bool ) and not (openshift.docker.hosted_registry_insecure | default(false) | bool)
- role: openshift_hosted_registry_console
when:
- openshift.common.version_gte_3_3_or_1_3 | bool
- openshift_hosted_manage_registry | default(true) | bool
- openshift_hosted_registry_console_deploy | default(true) | bool
- not (openshift.docker.hosted_registry_insecure | default(false) | bool


- name: Update master-config for publicLoggingURL
hosts: oo_masters_to_config:!oo_first_master
Expand Down
2 changes: 1 addition & 1 deletion roles/cockpit-ui/meta/main.yml → ...ift_hosted_registry_console/meta/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
galaxy_info:
author: Samuel Munilla
description: Deploy and Enable cockpit-ui
description: Deploy and Enable Registry Console (cockpit-ui)
company: Red Hat, Inc.
license: Apache License, Version 2.0
min_ansible_version: 2.1
Expand Down
9 changes: 7 additions & 2 deletions roles/cockpit-ui/tasks/main.yml → ...ft_hosted_registry_console/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
---
## this role formally named 'cockpit-ui'
- block:
- name: Create passthrough route for docker-registry
oc_route:
Expand Down Expand Up @@ -38,8 +39,12 @@
- name: Deploy registry-console
command: >
{{ openshift.common.client_binary }} new-app --template=registry-console
{% if openshift_cockpit_deployer_prefix is defined %}-p IMAGE_PREFIX="{{ openshift_cockpit_deployer_prefix }}"{% endif %}
{% if openshift_cockpit_deployer_version is defined %}-p IMAGE_VERSION="{{ openshift_cockpit_deployer_version }}"{% endif %}
{% if openshift_hosted_registry_console_deployer_prefix | default(openshift_cockpit_deployer_prefix) | default('') != '' %}
-p IMAGE_PREFIX="{{ openshift_hosted_cockpit_deployer_prefix | default(openshift_cockpit_deployer_prefix) }}"
{% endif %}
{% if openshift_hosted_registry_console_deployer_version | default(openshift_cockpit_deployer_version) | default('') != '' %}
-p IMAGE_VERSION="{{ openshift_hosted_registry_console_deployer_prefix | default(openshift_cockpit_deployer_version) }}
"{% endif %}
-p OPENSHIFT_OAUTH_PROVIDER_URL="{{ openshift.master.public_api_url }}"
-p REGISTRY_HOST="{{ docker_registry_route.results.results[0].spec.host }}"
-p COCKPIT_KUBE_URL="https://{{ registry_console_cockpit_kube.results.results[0].spec.host }}"
Expand Down