summaryrefslogtreecommitdiffstats
path: root/playbooks/byo
diff options
context:
space:
mode:
Diffstat (limited to 'playbooks/byo')
-rw-r--r--playbooks/byo/openshift-cluster/openshift-hosted.yml4
-rw-r--r--playbooks/byo/openshift-cluster/openshift-prometheus.yml4
-rw-r--r--playbooks/byo/openshift-cluster/redeploy-certificates.yml8
-rw-r--r--playbooks/byo/openshift-cluster/redeploy-etcd-certificates.yml2
-rw-r--r--playbooks/byo/openshift-cluster/redeploy-master-certificates.yml4
-rw-r--r--playbooks/byo/openshift-glusterfs/README.md98
-rw-r--r--playbooks/byo/openshift-glusterfs/config.yml4
l---------playbooks/byo/openshift-glusterfs/filter_plugins1
l---------playbooks/byo/openshift-glusterfs/lookup_plugins1
-rw-r--r--playbooks/byo/openshift-glusterfs/registry.yml4
l---------playbooks/byo/openshift-glusterfs/roles1
-rw-r--r--playbooks/byo/openshift-management/add_container_provider.yml4
-rw-r--r--playbooks/byo/openshift-management/add_many_container_providers.yml36
-rw-r--r--playbooks/byo/openshift-management/config.yml4
l---------playbooks/byo/openshift-management/roles1
-rw-r--r--playbooks/byo/openshift-management/uninstall.yml2
-rw-r--r--playbooks/byo/openshift-master/additional_config.yml4
-rw-r--r--playbooks/byo/openshift-master/certificates.yml4
-rw-r--r--playbooks/byo/openshift-master/config.yml4
l---------playbooks/byo/openshift-master/filter_plugins1
l---------playbooks/byo/openshift-master/lookup_plugins1
-rw-r--r--playbooks/byo/openshift-master/restart.yml4
l---------playbooks/byo/openshift-master/roles1
-rw-r--r--playbooks/byo/openshift-master/scaleup.yml23
24 files changed, 7 insertions, 213 deletions
diff --git a/playbooks/byo/openshift-cluster/openshift-hosted.yml b/playbooks/byo/openshift-cluster/openshift-hosted.yml
deleted file mode 100644
index 0855a2fb6..000000000
--- a/playbooks/byo/openshift-cluster/openshift-hosted.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-- include: ../../init/main.yml
-
-- include: ../../common/openshift-cluster/openshift_hosted.yml
diff --git a/playbooks/byo/openshift-cluster/openshift-prometheus.yml b/playbooks/byo/openshift-cluster/openshift-prometheus.yml
deleted file mode 100644
index 634ee2a80..000000000
--- a/playbooks/byo/openshift-cluster/openshift-prometheus.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-- include: ../../init/main.yml
-
-- include: ../../common/openshift-cluster/openshift_prometheus.yml
diff --git a/playbooks/byo/openshift-cluster/redeploy-certificates.yml b/playbooks/byo/openshift-cluster/redeploy-certificates.yml
index 46bdead08..c26f11772 100644
--- a/playbooks/byo/openshift-cluster/redeploy-certificates.yml
+++ b/playbooks/byo/openshift-cluster/redeploy-certificates.yml
@@ -13,7 +13,7 @@
- include: ../../common/openshift-cluster/redeploy-certificates/masters-backup.yml
-- include: ../../common/openshift-master/certificates.yml
+- include: ../../openshift-master/private/certificates.yml
vars:
openshift_certificates_redeploy: true
@@ -27,7 +27,7 @@
vars:
g_etcd_certificates_expired: "{{ ('expired' in (hostvars | oo_select_keys(groups['etcd']) | oo_collect('check_results.check_results.etcd') | oo_collect('health'))) | bool }}"
-- include: ../../common/openshift-master/restart.yml
+- include: ../../openshift-master/private/restart.yml
- include: ../../openshift-node/private/restart.yml
@@ -37,6 +37,6 @@
- include: ../../common/openshift-cluster/redeploy-certificates/registry.yml
when: openshift_hosted_manage_registry | default(true) | bool
-- include: ../../common/openshift-master/revert-client-ca.yml
+- include: ../../openshift-master/private/revert-client-ca.yml
-- include: ../../common/openshift-master/restart.yml
+- include: ../../openshift-master/private/restart.yml
diff --git a/playbooks/byo/openshift-cluster/redeploy-etcd-certificates.yml b/playbooks/byo/openshift-cluster/redeploy-etcd-certificates.yml
index f9d12251f..94e50cc28 100644
--- a/playbooks/byo/openshift-cluster/redeploy-etcd-certificates.yml
+++ b/playbooks/byo/openshift-cluster/redeploy-etcd-certificates.yml
@@ -15,4 +15,4 @@
vars:
g_etcd_certificates_expired: "{{ ('expired' in (hostvars | oo_select_keys(groups['etcd']) | oo_collect('check_results.check_results.etcd') | oo_collect('health'))) | bool }}"
-- include: ../../common/openshift-master/restart.yml
+- include: ../../openshift-master/private/restart.yml
diff --git a/playbooks/byo/openshift-cluster/redeploy-master-certificates.yml b/playbooks/byo/openshift-cluster/redeploy-master-certificates.yml
index 6a4528b7f..88e52f809 100644
--- a/playbooks/byo/openshift-cluster/redeploy-master-certificates.yml
+++ b/playbooks/byo/openshift-cluster/redeploy-master-certificates.yml
@@ -3,8 +3,8 @@
- include: ../../common/openshift-cluster/redeploy-certificates/masters-backup.yml
-- include: ../../common/openshift-master/certificates.yml
+- include: ../../openshift-master/private/certificates.yml
vars:
openshift_certificates_redeploy: true
-- include: ../../common/openshift-master/restart.yml
+- include: ../../openshift-master/private/restart.yml
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=<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=<other 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/byo/openshift-management/add_container_provider.yml b/playbooks/byo/openshift-management/add_container_provider.yml
deleted file mode 100644
index e2f558550..000000000
--- a/playbooks/byo/openshift-management/add_container_provider.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-- include: ../../init/evaluate_groups.yml
-
-- include: ../../common/openshift-management/add_container_provider.yml
diff --git a/playbooks/byo/openshift-management/add_many_container_providers.yml b/playbooks/byo/openshift-management/add_many_container_providers.yml
deleted file mode 100644
index 62fdb11c5..000000000
--- a/playbooks/byo/openshift-management/add_many_container_providers.yml
+++ /dev/null
@@ -1,36 +0,0 @@
----
-- hosts: localhost
- tasks:
- - name: Ensure the container provider configuration is defined
- assert:
- that: container_providers_config is defined
- msg: |
- Error: Must provide providers config path. Fix: Add '-e container_providers_config=/path/to/your/config' to the ansible-playbook command
-
- - name: Include providers/management configuration
- include_vars:
- file: "{{ container_providers_config }}"
-
- - name: Ensure this cluster is a container provider
- uri:
- url: "https://{{ management_server['hostname'] }}/api/providers"
- body_format: json
- method: POST
- user: "{{ management_server['user'] }}"
- password: "{{ management_server['password'] }}"
- validate_certs: no
- # Docs on formatting the BODY of the POST request:
- # http://manageiq.org/docs/reference/latest/api/reference/providers.html#specifying-connection-configurations
- body: "{{ item }}"
- failed_when: false
- with_items: "{{ container_providers }}"
- register: results
-
- # Include openshift_management for access to filter_plugins.
- - include_role:
- name: openshift_management
- tasks_from: noop
-
- - name: print each result
- debug:
- msg: "{{ results.results | oo_filter_container_providers }}"
diff --git a/playbooks/byo/openshift-management/config.yml b/playbooks/byo/openshift-management/config.yml
deleted file mode 100644
index e699fd014..000000000
--- a/playbooks/byo/openshift-management/config.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-- include: ../../init/main.yml
-
-- include: ../../common/openshift-management/config.yml
diff --git a/playbooks/byo/openshift-management/roles b/playbooks/byo/openshift-management/roles
deleted file mode 120000
index 20c4c58cf..000000000
--- a/playbooks/byo/openshift-management/roles
+++ /dev/null
@@ -1 +0,0 @@
-../../../roles \ No newline at end of file
diff --git a/playbooks/byo/openshift-management/uninstall.yml b/playbooks/byo/openshift-management/uninstall.yml
deleted file mode 100644
index e95c1c88a..000000000
--- a/playbooks/byo/openshift-management/uninstall.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-- include: ../../common/openshift-management/uninstall.yml
diff --git a/playbooks/byo/openshift-master/additional_config.yml b/playbooks/byo/openshift-master/additional_config.yml
deleted file mode 100644
index 1454190b2..000000000
--- a/playbooks/byo/openshift-master/additional_config.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-- include: ../../init/main.yml
-
-- include: ../../common/openshift-master/additional_config.yml
diff --git a/playbooks/byo/openshift-master/certificates.yml b/playbooks/byo/openshift-master/certificates.yml
deleted file mode 100644
index 344985244..000000000
--- a/playbooks/byo/openshift-master/certificates.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-- include: ../../init/main.yml
-
-- include: ../../common/openshift-master/certificates.yml
diff --git a/playbooks/byo/openshift-master/config.yml b/playbooks/byo/openshift-master/config.yml
deleted file mode 100644
index 913525e65..000000000
--- a/playbooks/byo/openshift-master/config.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-- include: ../../init/main.yml
-
-- include: ../../common/openshift-master/config.yml
diff --git a/playbooks/byo/openshift-master/filter_plugins b/playbooks/byo/openshift-master/filter_plugins
deleted file mode 120000
index 99a95e4ca..000000000
--- a/playbooks/byo/openshift-master/filter_plugins
+++ /dev/null
@@ -1 +0,0 @@
-../../../filter_plugins \ No newline at end of file
diff --git a/playbooks/byo/openshift-master/lookup_plugins b/playbooks/byo/openshift-master/lookup_plugins
deleted file mode 120000
index ac79701db..000000000
--- a/playbooks/byo/openshift-master/lookup_plugins
+++ /dev/null
@@ -1 +0,0 @@
-../../../lookup_plugins \ No newline at end of file
diff --git a/playbooks/byo/openshift-master/restart.yml b/playbooks/byo/openshift-master/restart.yml
deleted file mode 100644
index d2031d928..000000000
--- a/playbooks/byo/openshift-master/restart.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-- include: ../../init/main.yml
-
-- include: ../../common/openshift-master/restart.yml
diff --git a/playbooks/byo/openshift-master/roles b/playbooks/byo/openshift-master/roles
deleted file mode 120000
index 20c4c58cf..000000000
--- a/playbooks/byo/openshift-master/roles
+++ /dev/null
@@ -1 +0,0 @@
-../../../roles \ No newline at end of file
diff --git a/playbooks/byo/openshift-master/scaleup.yml b/playbooks/byo/openshift-master/scaleup.yml
deleted file mode 100644
index 4fdec5e7d..000000000
--- a/playbooks/byo/openshift-master/scaleup.yml
+++ /dev/null
@@ -1,23 +0,0 @@
----
-- include: ../../init/evaluate_groups.yml
-
-- name: Ensure there are new_masters or new_nodes
- hosts: localhost
- connection: local
- become: no
- gather_facts: no
- tasks:
- - fail:
- msg: >
- Detected no new_masters or no new_nodes in inventory. Please
- add hosts to the new_masters and new_nodes host groups to add
- masters.
- when:
- - g_new_master_hosts | default([]) | length == 0
- - g_new_node_hosts | default([]) | length == 0
-
-# Need a better way to do the above check for node without
-# running evaluate_groups and init/main.yml
-- include: ../../init/main.yml
-
-- include: ../../common/openshift-master/scaleup.yml