Merge pull request #6217 from mtnbikenc/consolidate-openshift-hosted

Playbook Consolidation - openshift-hosted

10 files changed, 4 insertions, 137 deletions

diff --git a/playbooks/common/openshift-cluster/cockpit-ui.yml b/playbooks/common/openshift-cluster/cockpit-ui.yml
deleted file mode 100644
index 359132dd0..000000000
--- a/playbooks/common/openshift-cluster/cockpit-ui.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-- name: Create Hosted Resources - cockpit-ui
-  hosts: oo_first_master
-  roles:
-  - role: cockpit-ui
-    when:
-    - openshift_hosted_manage_registry | default(true) | bool
-    - not openshift.docker.hosted_registry_insecure | default(false) | bool
diff --git a/playbooks/common/openshift-cluster/config.yml b/playbooks/common/openshift-cluster/config.yml
index fce5b652d..1a4ed9441 100644
--- a/playbooks/common/openshift-cluster/config.yml
+++ b/playbooks/common/openshift-cluster/config.yml
@@ -18,7 +18,7 @@
 - include: ../openshift-glusterfs/config.yml
   when: groups.oo_glusterfs_to_config | default([]) | count > 0
 
-- include: openshift_hosted.yml
+- include: ../../openshift-hosted/private/config.yml
 
 - include: ../../openshift-metrics/private/config.yml
   when: openshift_metrics_install_metrics | default(false) | bool
@@ -26,6 +26,9 @@
 - include: openshift_logging.yml
   when: openshift_logging_install_logging | default(false) | bool
 
+- include: ../../openshift-prometheus/private/config.yml
+  when: openshift_hosted_prometheus_deploy | default(false) | bool
+
 - include: service_catalog.yml
   when: openshift_enable_service_catalog | default(true) | bool
 
diff --git a/playbooks/common/openshift-cluster/create_persistent_volumes.yml b/playbooks/common/openshift-cluster/create_persistent_volumes.yml
deleted file mode 100644
index 8a60a30b8..000000000
--- a/playbooks/common/openshift-cluster/create_persistent_volumes.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-- name: Create Hosted Resources - persistent volumes
-  hosts: oo_first_master
-  vars:
-    persistent_volumes: "{{ hostvars[groups.oo_first_master.0] | oo_persistent_volumes(groups) }}"
-    persistent_volume_claims: "{{ hostvars[groups.oo_first_master.0] | oo_persistent_volume_claims }}"
-  roles:
-  - role: openshift_persistent_volumes
-    when: persistent_volumes | length > 0 or persistent_volume_claims | length > 0
diff --git a/playbooks/common/openshift-cluster/install_docker_gc.yml b/playbooks/common/openshift-cluster/install_docker_gc.yml
deleted file mode 100644
index 1e3dfee07..000000000
--- a/playbooks/common/openshift-cluster/install_docker_gc.yml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-- name: Install docker gc
-  hosts: oo_first_master
-  gather_facts: false
-  tasks:
-    - include_role:
-        name: openshift_docker_gc
diff --git a/playbooks/common/openshift-cluster/openshift_default_storage_class.yml b/playbooks/common/openshift-cluster/openshift_default_storage_class.yml
deleted file mode 100644
index 62fe0dd60..000000000
--- a/playbooks/common/openshift-cluster/openshift_default_storage_class.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-- name: Create Hosted Resources - openshift_default_storage_class
-  hosts: oo_first_master
-  roles:
-  - role: openshift_default_storage_class
-    when: openshift_cloudprovider_kind is defined and (openshift_cloudprovider_kind == 'aws' or openshift_cloudprovider_kind == 'gce' or openshift_cloudprovider_kind == 'openstack')
diff --git a/playbooks/common/openshift-cluster/openshift_hosted.yml b/playbooks/common/openshift-cluster/openshift_hosted.yml
deleted file mode 100644
index 15ee60dc0..000000000
--- a/playbooks/common/openshift-cluster/openshift_hosted.yml
+++ /dev/null
@@ -1,44 +0,0 @@
----
-- name: Hosted Install Checkpoint Start
-  hosts: all
-  gather_facts: false
-  tasks:
-  - name: Set Hosted install 'In Progress'
-    run_once: true
-    set_stats:
-      data:
-        installer_phase_hosted:
-          status: "In Progress"
-          start: "{{ lookup('pipe', 'date +%Y%m%d%H%M%SZ') }}"
-
-- include: create_persistent_volumes.yml
-
-- include: openshift_default_storage_class.yml
-
-- include: openshift_hosted_create_projects.yml
-
-- include: openshift_hosted_router.yml
-
-- include: openshift_hosted_registry.yml
-
-- include: cockpit-ui.yml
-
-- include: openshift_prometheus.yml
-  when: openshift_hosted_prometheus_deploy | default(False) | bool
-
-- include: install_docker_gc.yml
-  when:
-  - openshift_use_crio | default(False) | bool
-  - openshift_crio_enable_docker_gc | default(False) | bool
-
-- name: Hosted Install Checkpoint End
-  hosts: all
-  gather_facts: false
-  tasks:
-  - name: Set Hosted install 'Complete'
-    run_once: true
-    set_stats:
-      data:
-        installer_phase_hosted:
-          status: "Complete"
-          end: "{{ lookup('pipe', 'date +%Y%m%d%H%M%SZ') }}"
diff --git a/playbooks/common/openshift-cluster/openshift_hosted_create_projects.yml b/playbooks/common/openshift-cluster/openshift_hosted_create_projects.yml
deleted file mode 100644
index d5ca5185c..000000000
--- a/playbooks/common/openshift-cluster/openshift_hosted_create_projects.yml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-- name: Create Hosted Resources - openshift projects
-  hosts: oo_first_master
-  tasks:
-  - include_role:
-      name: openshift_hosted
-      tasks_from: create_projects.yml
diff --git a/playbooks/common/openshift-cluster/openshift_hosted_registry.yml b/playbooks/common/openshift-cluster/openshift_hosted_registry.yml
deleted file mode 100644
index 2a91a827c..000000000
--- a/playbooks/common/openshift-cluster/openshift_hosted_registry.yml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-- name: Create Hosted Resources - registry
-  hosts: oo_first_master
-  tasks:
-  - set_fact:
-      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"
-  - include_role:
-      name: openshift_hosted
-      tasks_from: registry.yml
-    when:
-    - openshift_hosted_manage_registry | default(True) | bool
-    - openshift_hosted_registry_registryurl is defined
diff --git a/playbooks/common/openshift-cluster/openshift_hosted_router.yml b/playbooks/common/openshift-cluster/openshift_hosted_router.yml
deleted file mode 100644
index bcb5a34a4..000000000
--- a/playbooks/common/openshift-cluster/openshift_hosted_router.yml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-- name: Create Hosted Resources - router
-  hosts: oo_first_master
-  tasks:
-  - set_fact:
-      openshift_hosted_router_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"
-  - include_role:
-      name: openshift_hosted
-      tasks_from: router.yml
-    when:
-    - openshift_hosted_manage_router | default(True) | bool
-    - openshift_hosted_router_registryurl is defined
diff --git a/playbooks/common/openshift-cluster/openshift_prometheus.yml b/playbooks/common/openshift-cluster/openshift_prometheus.yml
deleted file mode 100644
index 7aa9a16e6..000000000
--- a/playbooks/common/openshift-cluster/openshift_prometheus.yml
+++ /dev/null
@@ -1,29 +0,0 @@
----
-- name: Prometheus Install Checkpoint Start
-  hosts: all
-  gather_facts: false
-  tasks:
-  - name: Set Prometheus install 'In Progress'
-    run_once: true
-    set_stats:
-      data:
-        installer_phase_prometheus:
-          status: "In Progress"
-          start: "{{ lookup('pipe', 'date +%Y%m%d%H%M%SZ') }}"
-
-- name: Create Hosted Resources - openshift_prometheus
-  hosts: oo_first_master
-  roles:
-  - role: openshift_prometheus
-
-- name: Prometheus Install Checkpoint End
-  hosts: all
-  gather_facts: false
-  tasks:
-  - name: Set Prometheus install 'Complete'
-    run_once: true
-    set_stats:
-      data:
-        installer_phase_prometheus:
-          status: "Complete"
-          end: "{{ lookup('pipe', 'date +%Y%m%d%H%M%SZ') }}"