From b972abfa8c47e821c55e519a8a1d08b771946e49 Mon Sep 17 00:00:00 2001 From: Russell Teague Date: Thu, 16 Nov 2017 16:10:56 -0500 Subject: Playbook Consolidation - openshift-glusterfs --- playbooks/aws/openshift-cluster/install.yml | 2 +- playbooks/byo/openshift-glusterfs/README.md | 98 ---------------------- playbooks/byo/openshift-glusterfs/config.yml | 4 - playbooks/byo/openshift-glusterfs/filter_plugins | 1 - playbooks/byo/openshift-glusterfs/lookup_plugins | 1 - playbooks/byo/openshift-glusterfs/registry.yml | 4 - playbooks/byo/openshift-glusterfs/roles | 1 - playbooks/common/openshift-cluster/config.yml | 2 +- playbooks/common/openshift-glusterfs/config.yml | 60 ------------- .../common/openshift-glusterfs/filter_plugins | 1 - .../common/openshift-glusterfs/lookup_plugins | 1 - playbooks/common/openshift-glusterfs/registry.yml | 49 ----------- playbooks/common/openshift-glusterfs/roles | 1 - playbooks/openshift-glusterfs/README.md | 98 ++++++++++++++++++++++ playbooks/openshift-glusterfs/config.yml | 4 + playbooks/openshift-glusterfs/private/config.yml | 60 +++++++++++++ .../openshift-glusterfs/private/filter_plugins | 1 + .../openshift-glusterfs/private/lookup_plugins | 1 + playbooks/openshift-glusterfs/private/registry.yml | 49 +++++++++++ playbooks/openshift-glusterfs/private/roles | 1 + playbooks/openshift-glusterfs/registry.yml | 4 + 21 files changed, 220 insertions(+), 223 deletions(-) delete mode 100644 playbooks/byo/openshift-glusterfs/README.md delete mode 100644 playbooks/byo/openshift-glusterfs/config.yml delete mode 120000 playbooks/byo/openshift-glusterfs/filter_plugins delete mode 120000 playbooks/byo/openshift-glusterfs/lookup_plugins delete mode 100644 playbooks/byo/openshift-glusterfs/registry.yml delete mode 120000 playbooks/byo/openshift-glusterfs/roles delete mode 100644 playbooks/common/openshift-glusterfs/config.yml delete mode 120000 playbooks/common/openshift-glusterfs/filter_plugins delete mode 120000 playbooks/common/openshift-glusterfs/lookup_plugins delete mode 100644 playbooks/common/openshift-glusterfs/registry.yml delete mode 120000 playbooks/common/openshift-glusterfs/roles create mode 100644 playbooks/openshift-glusterfs/README.md create mode 100644 playbooks/openshift-glusterfs/config.yml create mode 100644 playbooks/openshift-glusterfs/private/config.yml create mode 120000 playbooks/openshift-glusterfs/private/filter_plugins create mode 120000 playbooks/openshift-glusterfs/private/lookup_plugins create mode 100644 playbooks/openshift-glusterfs/private/registry.yml create mode 120000 playbooks/openshift-glusterfs/private/roles create mode 100644 playbooks/openshift-glusterfs/registry.yml diff --git a/playbooks/aws/openshift-cluster/install.yml b/playbooks/aws/openshift-cluster/install.yml index 8756fb52a..43539841e 100644 --- a/playbooks/aws/openshift-cluster/install.yml +++ b/playbooks/aws/openshift-cluster/install.yml @@ -42,5 +42,5 @@ include: ../../common/openshift-node/config.yml - name: include openshift-glusterfs - include: ../../common/openshift-glusterfs/config.yml + include: ../../openshift-glusterfs/private/config.yml when: groups.oo_glusterfs_to_config | default([]) | count > 0 diff --git a/playbooks/byo/openshift-glusterfs/README.md b/playbooks/byo/openshift-glusterfs/README.md deleted file mode 100644 index f62aea229..000000000 --- a/playbooks/byo/openshift-glusterfs/README.md +++ /dev/null @@ -1,98 +0,0 @@ -# OpenShift GlusterFS Playbooks - -These playbooks are intended to enable the use of GlusterFS volumes by pods in -OpenShift. While they try to provide a sane set of defaults they do cover a -variety of scenarios and configurations, so read carefully. :) - -## Playbook: config.yml - -This is the main playbook that integrates GlusterFS into a new or existing -OpenShift cluster. It will also, if specified, configure a hosted Docker -registry with GlusterFS backend storage. - -This playbook requires the `glusterfs` group to exist in the Ansible inventory -file. The hosts in this group are the nodes of the GlusterFS cluster. - - * If this is a newly configured cluster each host must have a - `glusterfs_devices` variable defined, each of which must be a list of block - storage devices intended for use only by the GlusterFS cluster. If this is - also an external GlusterFS cluster, you must specify - `openshift_storage_glusterfs_is_native=False`. If the cluster is to be - managed by an external heketi service you must also specify - `openshift_storage_glusterfs_heketi_is_native=False` and - `openshift_storage_glusterfs_heketi_url=` with the URL to the heketi - service. All these variables are specified in `[OSEv3:vars]`, - * If this is an existing cluster you do not need to specify a list of block - devices but you must specify the following variables in `[OSEv3:vars]`: - * `openshift_storage_glusterfs_is_missing=False` - * `openshift_storage_glusterfs_heketi_is_missing=False` - -By default, pods for a native GlusterFS cluster will be created in the -`default` namespace. To change this, specify -`openshift_storage_glusterfs_namespace=` in `[OSEv3:vars]`. - -To configure the deployment of a Docker registry with GlusterFS backend -storage, specify `openshift_hosted_registry_storage_kind=glusterfs` in -`[OSEv3:vars]`. To create a separate GlusterFS cluster for use only by the -registry, specify a `glusterfs_registry` group that is populated as the -`glusterfs` is with the nodes for the separate cluster. If no -`glusterfs_registry` group is specified, the cluster defined by the `glusterfs` -group will be used. - -To swap an existing hosted registry's backend storage for a GlusterFS volume, -specify `openshift_hosted_registry_storage_glusterfs_swap=True`. To -additoinally copy any existing contents from an existing hosted registry, -specify `openshift_hosted_registry_storage_glusterfs_swapcopy=True`. - -**NOTE:** For each namespace that is to have access to GlusterFS volumes an -Enpoints resource pointing to the GlusterFS cluster nodes and a corresponding -Service resource must be created. If dynamic provisioning using StorageClasses -is configure, these resources are created automatically in the namespaces that -require them. This playbook also takes care of creating these resources in the -namespaces used for deployment. - -An example of a minimal inventory file: -``` -[OSEv3:children] -masters -nodes -glusterfs - -[OSEv3:vars] -ansible_ssh_user=root -deployment_type=origin - -[masters] -master - -[nodes] -node0 -node1 -node2 - -[glusterfs] -node0 glusterfs_devices='[ "/dev/sdb" ]' -node1 glusterfs_devices='[ "/dev/sdb", "/dev/sdc" ]' -node2 glusterfs_devices='[ "/dev/sdd" ]' -``` - -## Playbook: registry.yml - -This playbook is intended for admins who want to deploy a hosted Docker -registry with GlusterFS backend storage on an existing OpenShift cluster. It -has all the same requirements and behaviors as `config.yml`. - -## Role: openshift_storage_glusterfs - -The bulk of the work is done by the `openshift_storage_glusterfs` role. This -role can handle the deployment of GlusterFS (if it is to be hosted on the -OpenShift cluster), the registration of GlusterFS nodes (hosted or standalone), -and (if specified) integration as backend storage for a hosted Docker registry. - -See the documentation in the role's directory for further details. - -## Role: openshift_hosted - -The `openshift_hosted` role recognizes `glusterfs` as a possible storage -backend for a hosted docker registry. It will also, if configured, handle the -swap of an existing registry's backend storage to a GlusterFS volume. diff --git a/playbooks/byo/openshift-glusterfs/config.yml b/playbooks/byo/openshift-glusterfs/config.yml deleted file mode 100644 index 120476bb8..000000000 --- a/playbooks/byo/openshift-glusterfs/config.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -- include: ../../init/main.yml - -- include: ../../common/openshift-glusterfs/config.yml diff --git a/playbooks/byo/openshift-glusterfs/filter_plugins b/playbooks/byo/openshift-glusterfs/filter_plugins deleted file mode 120000 index 99a95e4ca..000000000 --- a/playbooks/byo/openshift-glusterfs/filter_plugins +++ /dev/null @@ -1 +0,0 @@ -../../../filter_plugins \ No newline at end of file diff --git a/playbooks/byo/openshift-glusterfs/lookup_plugins b/playbooks/byo/openshift-glusterfs/lookup_plugins deleted file mode 120000 index ac79701db..000000000 --- a/playbooks/byo/openshift-glusterfs/lookup_plugins +++ /dev/null @@ -1 +0,0 @@ -../../../lookup_plugins \ No newline at end of file diff --git a/playbooks/byo/openshift-glusterfs/registry.yml b/playbooks/byo/openshift-glusterfs/registry.yml deleted file mode 100644 index 32734f863..000000000 --- a/playbooks/byo/openshift-glusterfs/registry.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -- include: ../../init/main.yml - -- include: ../../common/openshift-glusterfs/registry.yml diff --git a/playbooks/byo/openshift-glusterfs/roles b/playbooks/byo/openshift-glusterfs/roles deleted file mode 120000 index 20c4c58cf..000000000 --- a/playbooks/byo/openshift-glusterfs/roles +++ /dev/null @@ -1 +0,0 @@ -../../../roles \ No newline at end of file diff --git a/playbooks/common/openshift-cluster/config.yml b/playbooks/common/openshift-cluster/config.yml index 3b4d6f9a6..33fcef200 100644 --- a/playbooks/common/openshift-cluster/config.yml +++ b/playbooks/common/openshift-cluster/config.yml @@ -15,7 +15,7 @@ - include: ../openshift-node/config.yml -- include: ../openshift-glusterfs/config.yml +- include: ../../openshift-glusterfs/private/config.yml when: groups.oo_glusterfs_to_config | default([]) | count > 0 - include: openshift_hosted.yml diff --git a/playbooks/common/openshift-glusterfs/config.yml b/playbooks/common/openshift-glusterfs/config.yml deleted file mode 100644 index 19e14ab3e..000000000 --- a/playbooks/common/openshift-glusterfs/config.yml +++ /dev/null @@ -1,60 +0,0 @@ ---- -- name: GlusterFS Install Checkpoint Start - hosts: all - gather_facts: false - tasks: - - name: Set GlusterFS install 'In Progress' - run_once: true - set_stats: - data: - installer_phase_glusterfs: - status: "In Progress" - start: "{{ lookup('pipe', 'date +%Y%m%d%H%M%SZ') }}" - -- name: Open firewall ports for GlusterFS nodes - hosts: glusterfs - tasks: - - include_role: - name: openshift_storage_glusterfs - tasks_from: firewall.yml - when: - - openshift_storage_glusterfs_is_native | default(True) | bool - - include_role: - name: openshift_storage_glusterfs - tasks_from: kernel_modules.yml - when: - - openshift_storage_glusterfs_is_native | default(True) | bool - -- name: Open firewall ports for GlusterFS registry nodes - hosts: glusterfs_registry - tasks: - - include_role: - name: openshift_storage_glusterfs - tasks_from: firewall.yml - when: - - openshift_storage_glusterfs_registry_is_native | default(True) | bool - - include_role: - name: openshift_storage_glusterfs - tasks_from: kernel_modules.yml - when: - - openshift_storage_glusterfs_registry_is_native | default(True) | bool - -- name: Configure GlusterFS - hosts: oo_first_master - tasks: - - name: setup glusterfs - include_role: - name: openshift_storage_glusterfs - when: groups.oo_glusterfs_to_config | default([]) | count > 0 - -- name: GlusterFS Install Checkpoint End - hosts: all - gather_facts: false - tasks: - - name: Set GlusterFS install 'Complete' - run_once: true - set_stats: - data: - installer_phase_glusterfs: - status: "Complete" - end: "{{ lookup('pipe', 'date +%Y%m%d%H%M%SZ') }}" diff --git a/playbooks/common/openshift-glusterfs/filter_plugins b/playbooks/common/openshift-glusterfs/filter_plugins deleted file mode 120000 index 99a95e4ca..000000000 --- a/playbooks/common/openshift-glusterfs/filter_plugins +++ /dev/null @@ -1 +0,0 @@ -../../../filter_plugins \ No newline at end of file diff --git a/playbooks/common/openshift-glusterfs/lookup_plugins b/playbooks/common/openshift-glusterfs/lookup_plugins deleted file mode 120000 index ac79701db..000000000 --- a/playbooks/common/openshift-glusterfs/lookup_plugins +++ /dev/null @@ -1 +0,0 @@ -../../../lookup_plugins \ No newline at end of file diff --git a/playbooks/common/openshift-glusterfs/registry.yml b/playbooks/common/openshift-glusterfs/registry.yml deleted file mode 100644 index 80cf7529e..000000000 --- a/playbooks/common/openshift-glusterfs/registry.yml +++ /dev/null @@ -1,49 +0,0 @@ ---- -- include: config.yml - -- name: Initialize GlusterFS registry PV and PVC vars - hosts: oo_first_master - tags: hosted - tasks: - - set_fact: - glusterfs_pv: [] - glusterfs_pvc: [] - - - set_fact: - glusterfs_pv: - - name: "{{ openshift.hosted.registry.storage.volume.name }}-glusterfs-volume" - capacity: "{{ openshift.hosted.registry.storage.volume.size }}" - access_modes: "{{ openshift.hosted.registry.storage.access.modes }}" - storage: - glusterfs: - endpoints: "{{ openshift.hosted.registry.storage.glusterfs.endpoints }}" - path: "{{ openshift.hosted.registry.storage.glusterfs.path }}" - readOnly: "{{ openshift.hosted.registry.storage.glusterfs.readOnly }}" - glusterfs_pvc: - - name: "{{ openshift.hosted.registry.storage.volume.name }}-glusterfs-claim" - capacity: "{{ openshift.hosted.registry.storage.volume.size }}" - access_modes: "{{ openshift.hosted.registry.storage.access.modes }}" - when: openshift.hosted.registry.storage.glusterfs.swap - -- name: Create persistent volumes - hosts: oo_first_master - tags: - - hosted - vars: - persistent_volumes: "{{ hostvars[groups.oo_first_master.0] | oo_persistent_volumes(groups, glusterfs_pv) }}" - persistent_volume_claims: "{{ hostvars[groups.oo_first_master.0] | oo_persistent_volume_claims(glusterfs_pvc) }}" - roles: - - role: openshift_persistent_volumes - when: persistent_volumes | union(glusterfs_pv) | length > 0 or persistent_volume_claims | union(glusterfs_pvc) | length > 0 - -- name: Create Hosted Resources - hosts: oo_first_master - tags: - - hosted - pre_tasks: - - set_fact: - openshift_hosted_router_registryurl: "{{ hostvars[groups.oo_first_master.0].openshift.master.registry_url }}" - openshift_hosted_registry_registryurl: "{{ hostvars[groups.oo_first_master.0].openshift.master.registry_url }}" - when: "'master' in hostvars[groups.oo_first_master.0].openshift and 'registry_url' in hostvars[groups.oo_first_master.0].openshift.master" - roles: - - role: openshift_hosted diff --git a/playbooks/common/openshift-glusterfs/roles b/playbooks/common/openshift-glusterfs/roles deleted file mode 120000 index e2b799b9d..000000000 --- a/playbooks/common/openshift-glusterfs/roles +++ /dev/null @@ -1 +0,0 @@ -../../../roles/ \ No newline at end of file diff --git a/playbooks/openshift-glusterfs/README.md b/playbooks/openshift-glusterfs/README.md new file mode 100644 index 000000000..f62aea229 --- /dev/null +++ b/playbooks/openshift-glusterfs/README.md @@ -0,0 +1,98 @@ +# OpenShift GlusterFS Playbooks + +These playbooks are intended to enable the use of GlusterFS volumes by pods in +OpenShift. While they try to provide a sane set of defaults they do cover a +variety of scenarios and configurations, so read carefully. :) + +## Playbook: config.yml + +This is the main playbook that integrates GlusterFS into a new or existing +OpenShift cluster. It will also, if specified, configure a hosted Docker +registry with GlusterFS backend storage. + +This playbook requires the `glusterfs` group to exist in the Ansible inventory +file. The hosts in this group are the nodes of the GlusterFS cluster. + + * If this is a newly configured cluster each host must have a + `glusterfs_devices` variable defined, each of which must be a list of block + storage devices intended for use only by the GlusterFS cluster. If this is + also an external GlusterFS cluster, you must specify + `openshift_storage_glusterfs_is_native=False`. If the cluster is to be + managed by an external heketi service you must also specify + `openshift_storage_glusterfs_heketi_is_native=False` and + `openshift_storage_glusterfs_heketi_url=` with the URL to the heketi + service. All these variables are specified in `[OSEv3:vars]`, + * If this is an existing cluster you do not need to specify a list of block + devices but you must specify the following variables in `[OSEv3:vars]`: + * `openshift_storage_glusterfs_is_missing=False` + * `openshift_storage_glusterfs_heketi_is_missing=False` + +By default, pods for a native GlusterFS cluster will be created in the +`default` namespace. To change this, specify +`openshift_storage_glusterfs_namespace=` in `[OSEv3:vars]`. + +To configure the deployment of a Docker registry with GlusterFS backend +storage, specify `openshift_hosted_registry_storage_kind=glusterfs` in +`[OSEv3:vars]`. To create a separate GlusterFS cluster for use only by the +registry, specify a `glusterfs_registry` group that is populated as the +`glusterfs` is with the nodes for the separate cluster. If no +`glusterfs_registry` group is specified, the cluster defined by the `glusterfs` +group will be used. + +To swap an existing hosted registry's backend storage for a GlusterFS volume, +specify `openshift_hosted_registry_storage_glusterfs_swap=True`. To +additoinally copy any existing contents from an existing hosted registry, +specify `openshift_hosted_registry_storage_glusterfs_swapcopy=True`. + +**NOTE:** For each namespace that is to have access to GlusterFS volumes an +Enpoints resource pointing to the GlusterFS cluster nodes and a corresponding +Service resource must be created. If dynamic provisioning using StorageClasses +is configure, these resources are created automatically in the namespaces that +require them. This playbook also takes care of creating these resources in the +namespaces used for deployment. + +An example of a minimal inventory file: +``` +[OSEv3:children] +masters +nodes +glusterfs + +[OSEv3:vars] +ansible_ssh_user=root +deployment_type=origin + +[masters] +master + +[nodes] +node0 +node1 +node2 + +[glusterfs] +node0 glusterfs_devices='[ "/dev/sdb" ]' +node1 glusterfs_devices='[ "/dev/sdb", "/dev/sdc" ]' +node2 glusterfs_devices='[ "/dev/sdd" ]' +``` + +## Playbook: registry.yml + +This playbook is intended for admins who want to deploy a hosted Docker +registry with GlusterFS backend storage on an existing OpenShift cluster. It +has all the same requirements and behaviors as `config.yml`. + +## Role: openshift_storage_glusterfs + +The bulk of the work is done by the `openshift_storage_glusterfs` role. This +role can handle the deployment of GlusterFS (if it is to be hosted on the +OpenShift cluster), the registration of GlusterFS nodes (hosted or standalone), +and (if specified) integration as backend storage for a hosted Docker registry. + +See the documentation in the role's directory for further details. + +## Role: openshift_hosted + +The `openshift_hosted` role recognizes `glusterfs` as a possible storage +backend for a hosted docker registry. It will also, if configured, handle the +swap of an existing registry's backend storage to a GlusterFS volume. diff --git a/playbooks/openshift-glusterfs/config.yml b/playbooks/openshift-glusterfs/config.yml new file mode 100644 index 000000000..8ee57ce8d --- /dev/null +++ b/playbooks/openshift-glusterfs/config.yml @@ -0,0 +1,4 @@ +--- +- include: ../init/main.yml + +- include: private/config.yml diff --git a/playbooks/openshift-glusterfs/private/config.yml b/playbooks/openshift-glusterfs/private/config.yml new file mode 100644 index 000000000..19e14ab3e --- /dev/null +++ b/playbooks/openshift-glusterfs/private/config.yml @@ -0,0 +1,60 @@ +--- +- name: GlusterFS Install Checkpoint Start + hosts: all + gather_facts: false + tasks: + - name: Set GlusterFS install 'In Progress' + run_once: true + set_stats: + data: + installer_phase_glusterfs: + status: "In Progress" + start: "{{ lookup('pipe', 'date +%Y%m%d%H%M%SZ') }}" + +- name: Open firewall ports for GlusterFS nodes + hosts: glusterfs + tasks: + - include_role: + name: openshift_storage_glusterfs + tasks_from: firewall.yml + when: + - openshift_storage_glusterfs_is_native | default(True) | bool + - include_role: + name: openshift_storage_glusterfs + tasks_from: kernel_modules.yml + when: + - openshift_storage_glusterfs_is_native | default(True) | bool + +- name: Open firewall ports for GlusterFS registry nodes + hosts: glusterfs_registry + tasks: + - include_role: + name: openshift_storage_glusterfs + tasks_from: firewall.yml + when: + - openshift_storage_glusterfs_registry_is_native | default(True) | bool + - include_role: + name: openshift_storage_glusterfs + tasks_from: kernel_modules.yml + when: + - openshift_storage_glusterfs_registry_is_native | default(True) | bool + +- name: Configure GlusterFS + hosts: oo_first_master + tasks: + - name: setup glusterfs + include_role: + name: openshift_storage_glusterfs + when: groups.oo_glusterfs_to_config | default([]) | count > 0 + +- name: GlusterFS Install Checkpoint End + hosts: all + gather_facts: false + tasks: + - name: Set GlusterFS install 'Complete' + run_once: true + set_stats: + data: + installer_phase_glusterfs: + status: "Complete" + end: "{{ lookup('pipe', 'date +%Y%m%d%H%M%SZ') }}" diff --git a/playbooks/openshift-glusterfs/private/filter_plugins b/playbooks/openshift-glusterfs/private/filter_plugins new file mode 120000 index 000000000..99a95e4ca --- /dev/null +++ b/playbooks/openshift-glusterfs/private/filter_plugins @@ -0,0 +1 @@ +../../../filter_plugins \ No newline at end of file diff --git a/playbooks/openshift-glusterfs/private/lookup_plugins b/playbooks/openshift-glusterfs/private/lookup_plugins new file mode 120000 index 000000000..ac79701db --- /dev/null +++ b/playbooks/openshift-glusterfs/private/lookup_plugins @@ -0,0 +1 @@ +../../../lookup_plugins \ No newline at end of file diff --git a/playbooks/openshift-glusterfs/private/registry.yml b/playbooks/openshift-glusterfs/private/registry.yml new file mode 100644 index 000000000..80cf7529e --- /dev/null +++ b/playbooks/openshift-glusterfs/private/registry.yml @@ -0,0 +1,49 @@ +--- +- include: config.yml + +- name: Initialize GlusterFS registry PV and PVC vars + hosts: oo_first_master + tags: hosted + tasks: + - set_fact: + glusterfs_pv: [] + glusterfs_pvc: [] + + - set_fact: + glusterfs_pv: + - name: "{{ openshift.hosted.registry.storage.volume.name }}-glusterfs-volume" + capacity: "{{ openshift.hosted.registry.storage.volume.size }}" + access_modes: "{{ openshift.hosted.registry.storage.access.modes }}" + storage: + glusterfs: + endpoints: "{{ openshift.hosted.registry.storage.glusterfs.endpoints }}" + path: "{{ openshift.hosted.registry.storage.glusterfs.path }}" + readOnly: "{{ openshift.hosted.registry.storage.glusterfs.readOnly }}" + glusterfs_pvc: + - name: "{{ openshift.hosted.registry.storage.volume.name }}-glusterfs-claim" + capacity: "{{ openshift.hosted.registry.storage.volume.size }}" + access_modes: "{{ openshift.hosted.registry.storage.access.modes }}" + when: openshift.hosted.registry.storage.glusterfs.swap + +- name: Create persistent volumes + hosts: oo_first_master + tags: + - hosted + vars: + persistent_volumes: "{{ hostvars[groups.oo_first_master.0] | oo_persistent_volumes(groups, glusterfs_pv) }}" + persistent_volume_claims: "{{ hostvars[groups.oo_first_master.0] | oo_persistent_volume_claims(glusterfs_pvc) }}" + roles: + - role: openshift_persistent_volumes + when: persistent_volumes | union(glusterfs_pv) | length > 0 or persistent_volume_claims | union(glusterfs_pvc) | length > 0 + +- name: Create Hosted Resources + hosts: oo_first_master + tags: + - hosted + pre_tasks: + - set_fact: + openshift_hosted_router_registryurl: "{{ hostvars[groups.oo_first_master.0].openshift.master.registry_url }}" + openshift_hosted_registry_registryurl: "{{ hostvars[groups.oo_first_master.0].openshift.master.registry_url }}" + when: "'master' in hostvars[groups.oo_first_master.0].openshift and 'registry_url' in hostvars[groups.oo_first_master.0].openshift.master" + roles: + - role: openshift_hosted diff --git a/playbooks/openshift-glusterfs/private/roles b/playbooks/openshift-glusterfs/private/roles new file mode 120000 index 000000000..e2b799b9d --- /dev/null +++ b/playbooks/openshift-glusterfs/private/roles @@ -0,0 +1 @@ +../../../roles/ \ No newline at end of file diff --git a/playbooks/openshift-glusterfs/registry.yml b/playbooks/openshift-glusterfs/registry.yml new file mode 100644 index 000000000..21b59b9ef --- /dev/null +++ b/playbooks/openshift-glusterfs/registry.yml @@ -0,0 +1,4 @@ +--- +- include: ../init/main.yml + +- include: private/registry.yml -- cgit v1.2.3