From 57dfae185d3d0e02ebe515263c54867bee37b45e Mon Sep 17 00:00:00 2001 From: Andrew Butcher Date: Thu, 30 Jun 2016 13:20:10 -0400 Subject: Various hosted component improvements * [openshift_projects] Add openshift_projects role * [openshift_hosted] hosted deployments use openshift_hosted_infra_selector if openshift_hosted__selector is not defined * [openshift_hosted] move openshift_projects, openshift_serviceaccounts and openshift_metrics to dependencies of openshift_hosted * [router] improve router deployment - add router option to force subdomain - add CA to router certificate options * [registry] move registry config into openshift_hosted role - additional registry fixes/tweaks - add s3 storage support for registry * [serviceaccount] fix up serviceaccount creation --- roles/openshift_registry/tasks/main.yml | 24 ------------------------ 1 file changed, 24 deletions(-) delete mode 100644 roles/openshift_registry/tasks/main.yml (limited to 'roles/openshift_registry/tasks') diff --git a/roles/openshift_registry/tasks/main.yml b/roles/openshift_registry/tasks/main.yml deleted file mode 100644 index 1eeec2fbb..000000000 --- a/roles/openshift_registry/tasks/main.yml +++ /dev/null @@ -1,24 +0,0 @@ ---- -- name: Deploy OpenShift Registry - command: > - {{ openshift.common.admin_binary }} registry - --create --replicas={{ openshift.master.infra_nodes | length }} - --service-account=registry {{ oreg_selector }} - --credentials={{ openshift_master_config_dir }}/openshift-registry.kubeconfig {{ oreg_images }} - register: oreg_results - changed_when: "'service exists' not in oreg_results.stdout" - -- name: Determine if volume is already attached to dc/docker-registry - command: "{{ openshift.common.client_binary }} get -o template dc/docker-registry --template=\\{\\{.spec.template.spec.volumes\\}\\}" - changed_when: false - register: registry_volumes_output - -- set_fact: - volume_attached: "{{ registry_volume_claim in registry_volumes_output.stdout }}" - -- name: Add volume to dc/docker-registry - command: > - {{ openshift.common.client_binary }} volume dc/docker-registry - --add --overwrite -t persistentVolumeClaim --claim-name={{ registry_volume_claim }} - --name=registry-storage - when: not volume_attached | bool -- cgit v1.2.3