diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-04-04 08:06:17 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-04 08:06:17 -0500 |
| commit | 68b31569f7867afd67915098712cc832df95e59d (patch) | |
| tree | 6a7ed907cd1c6693f2a8d528d39aa18d1a08478a | |
| parent | d2b88f81b8766918d3d818bd9624535f01177825 (diff) | |
| parent | bbcbf905f128e802ef605cbc7a282d9df1fbb2fc (diff) | |
Merge pull request #3519 from sdodson/registry-svc-signing
Merged by openshift-bot
| -rw-r--r-- | playbooks/common/openshift-cluster/redeploy-certificates/registry.yml | 2 | ||||
| -rw-r--r-- | roles/openshift_hosted/tasks/registry/secure.yml | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/playbooks/common/openshift-cluster/redeploy-certificates/registry.yml b/playbooks/common/openshift-cluster/redeploy-certificates/registry.yml index e82996cf4..8c8062585 100644 --- a/playbooks/common/openshift-cluster/redeploy-certificates/registry.yml +++ b/playbooks/common/openshift-cluster/redeploy-certificates/registry.yml @@ -66,7 +66,7 @@ --signer-cert={{ openshift.common.config_base }}/master/ca.crt --signer-key={{ openshift.common.config_base }}/master/ca.key --signer-serial={{ openshift.common.config_base }}/master/ca.serial.txt - --hostnames="{{ docker_registry_service_ip.results.clusterip }},docker-registry.default.svc.cluster.local,{{ docker_registry_route_hostname }}" + --hostnames="{{ docker_registry_service_ip.results.clusterip }},docker-registry.default.svc,docker-registry.default.svc.cluster.local,{{ docker_registry_route_hostname }}" --cert={{ openshift.common.config_base }}/master/registry.crt --key={{ openshift.common.config_base }}/master/registry.key {% if openshift_version | oo_version_gte_3_5_or_1_5(openshift.common.deployment_type) | bool %} diff --git a/roles/openshift_hosted/tasks/registry/secure.yml b/roles/openshift_hosted/tasks/registry/secure.yml index 8a159bf73..29c164f52 100644 --- a/roles/openshift_hosted/tasks/registry/secure.yml +++ b/roles/openshift_hosted/tasks/registry/secure.yml @@ -53,7 +53,8 @@ signer_serial: "{{ openshift_master_config_dir }}/ca.serial.txt" hostnames: - "{{ docker_registry_service_ip.results.clusterip }}" - - docker-registry.default.svc.cluster.local + - "{{ openshift_hosted_registry_name }}.default.svc" + - "{{ openshift_hosted_registry_name }}.default.svc.{{ openshift.common.dns_domain }}" - "{{ docker_registry_route_hostname }}" cert: "{{ openshift_master_config_dir }}/registry.crt" key: "{{ openshift_master_config_dir }}/registry.key" |