Merge pull request #5368 from jianlinliu/bz1490738

Update registry_config.j2 to fix BZ#1490738

roles/openshift_hosted/templates/registry_config.j2

@@ -53,7 +53,7 @@ storage:
 {%   if openshift_hosted_registry_storage_swift_domain is defined %}
     domain: {{ openshift_hosted_registry_storage_swift_domain }}
 {%   endif -%}
-{%   if openshift_hosted_registry_storage_swift_domainid %}
+{%   if openshift_hosted_registry_storage_swift_domainid is defined %}
     domainid: {{ openshift_hosted_registry_storage_swift_domainid }}
 {%   endif -%}
 {% elif openshift_hosted_registry_storage_provider | default('') == 'gcs' %}
@@ -63,7 +63,7 @@ storage:
     keyfile: /etc/registry/gcs.json
 {%   endif -%}
 {%   if openshift_hosted_registry_storage_gcs_rootdirectory is defined %}
-    rootdirectory: {{ openshift_hosted_registry_storage_gcs_rootdirectory }}
+    rootdirectory: {{ openshift_hosted_registry_storage_gcs_rootdirectory | default('/registry') }}
 {%   endif -%}
 {% endif -%}
 auth: