Document openshift_cockpit_deployer_prefix and add

openshift_cockpit_deployer_version

Fixes Bug 1393666

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

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

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 }}"