diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-02-09 17:30:27 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-09 17:30:27 -0500 |
| commit | ce9cf2d55babcc1e2ec8eb4b2d69f944d5e728be (patch) | |
| tree | 9d7f4c0b3f85fe78f65a9fd0ed072ecf516c9d04 | |
| parent | 8ee9a7bfe9901db69e5d2ee1d118ed0f7ce81005 (diff) | |
| parent | 00f438ac92323cf3f2109adb7f2f70998f77bc23 (diff) | |
| download | openshift-ce9cf2d55babcc1e2ec8eb4b2d69f944d5e728be.tar.gz openshift-ce9cf2d55babcc1e2ec8eb4b2d69f944d5e728be.tar.bz2 openshift-ce9cf2d55babcc1e2ec8eb4b2d69f944d5e728be.tar.xz openshift-ce9cf2d55babcc1e2ec8eb4b2d69f944d5e728be.zip | |
Merge pull request #3317 from sdodson/bz1393666
Document openshift_cockpit_deployer_prefix and add
| -rw-r--r-- | inventory/byo/hosts.origin.example | 7 | ||||
| -rw-r--r-- | inventory/byo/hosts.ose.example | 7 | ||||
| -rw-r--r-- | roles/cockpit-ui/tasks/main.yml | 2 |
3 files changed, 16 insertions, 0 deletions
diff --git a/inventory/byo/hosts.origin.example b/inventory/byo/hosts.origin.example index c5f9db909..a4a01670a 100644 --- a/inventory/byo/hosts.origin.example +++ b/inventory/byo/hosts.origin.example @@ -301,6 +301,13 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true', # Disable management of the OpenShift Router #openshift_hosted_manage_router=false +# 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/ +# Override image version, defaults to latest for origin, matches the product version for enterprise +#openshift_cockpit_deployer_version=1.4.1 + # Openshift Registry Options # # An OpenShift registry will be created during install if there are diff --git a/inventory/byo/hosts.ose.example b/inventory/byo/hosts.ose.example index cacdbf115..91ebf9936 100644 --- a/inventory/byo/hosts.ose.example +++ b/inventory/byo/hosts.ose.example @@ -301,6 +301,13 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true', # Disable management of the OpenShift Router #openshift_hosted_manage_router=false +# 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/ +# Override image version, defaults to latest for origin, matches the product version for enterprise +#openshift_cockpit_deployer_version=1.4.1 + # Openshift Registry Options # # An OpenShift registry will be created during install if there are diff --git a/roles/cockpit-ui/tasks/main.yml b/roles/cockpit-ui/tasks/main.yml index 87ed7fee7..f2ef4f161 100644 --- a/roles/cockpit-ui/tasks/main.yml +++ b/roles/cockpit-ui/tasks/main.yml @@ -63,10 +63,12 @@ changed_when: false when: check_docker_registry_exists.rc == 0 +# TODO: Need to fix the origin and enterprise templates so that they both respect IMAGE_PREFIX - 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 %} -p OPENSHIFT_OAUTH_PROVIDER_URL="{{ openshift.master.public_api_url }}" -p REGISTRY_HOST="{{ docker_registry_route.stdout }}" -p COCKPIT_KUBE_URL="{{ registry_console_cockpit_kube_url.stdout }}" |