rename cockpit-ui -> openshift_hosted_registry_console

openshift · Mar 31, 2017 · a2c30fc · a2c30fc
1 parent e25214b
commit a2c30fc
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 9 deletions.
diff --git a/inventory/byo/hosts.origin.example b/inventory/byo/hosts.origin.example
@@ -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
 #

diff --git a/inventory/byo/hosts.ose.example b/inventory/byo/hosts.ose.example
@@ -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
 #

diff --git a/playbooks/common/openshift-cluster/openshift_hosted.yml b/playbooks/common/openshift-cluster/openshift_hosted.yml
@@ -43,11 +43,11 @@
     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
+  - 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 | default(true) | bool
+    - openshift_hosted_cockpit_deploy | default(true) | bool
     - not (openshift.docker.hosted_registry_insecure | default(false) | bool
 
 

diff --git a/roles/cockpit-ui/meta/main.yml → ...ift_hosted_registry_console/meta/main.yml b/roles/cockpit-ui/meta/main.yml → ...ift_hosted_registry_console/meta/main.yml
@@ -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

diff --git a/roles/cockpit-ui/tasks/main.yml → ...ft_hosted_registry_console/tasks/main.yml b/roles/cockpit-ui/tasks/main.yml → ...ft_hosted_registry_console/tasks/main.yml
@@ -1,4 +1,5 @@
 ---
+## this role formally named 'cockpit-ui'
 - block:
   - name: Create passthrough route for docker-registry
     oc_route:
@@ -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 }}"