Merge pull request #6146 from mtnbikenc/consolidate-openshift-loadbalancer

Playbook Consolidation - openshift-loadbalancer

6 files changed, 2 insertions, 56 deletions

diff --git a/playbooks/common/openshift-cluster/config.yml b/playbooks/common/openshift-cluster/config.yml
index 81b163b80..bd65b3c8f 100644
--- a/playbooks/common/openshift-cluster/config.yml
+++ b/playbooks/common/openshift-cluster/config.yml
@@ -6,7 +6,7 @@
 - include: ../../openshift-nfs/private/config.yml
   when: groups.oo_nfs_to_config | default([]) | count > 0
 
-- include: ../openshift-loadbalancer/config.yml
+- include: ../../openshift-loadbalancer/private/config.yml
   when: groups.oo_lb_to_config | default([]) | count > 0
 
 - include: ../openshift-master/config.yml
diff --git a/playbooks/common/openshift-loadbalancer/config.yml b/playbooks/common/openshift-loadbalancer/config.yml
deleted file mode 100644
index d737b836b..000000000
--- a/playbooks/common/openshift-loadbalancer/config.yml
+++ /dev/null
@@ -1,51 +0,0 @@
----
-- name: Load Balancer Install Checkpoint Start
-  hosts: all
-  gather_facts: false
-  tasks:
-  - name: Set load balancer install 'In Progress'
-    run_once: true
-    set_stats:
-      data:
-        installer_phase_loadbalancer:
-          status: "In Progress"
-          start: "{{ lookup('pipe', 'date +%Y%m%d%H%M%SZ') }}"
-
-- name: Configure firewall and docker for load balancers
-  hosts: oo_lb_to_config:!oo_masters_to_config:!oo_nodes_to_config
-  vars:
-    openshift_image_tag: "{{ hostvars[groups.oo_first_master.0].openshift_image_tag }}"
-  roles:
-  - role: os_firewall
-  - role: openshift_docker
-    when: openshift.common.is_containerized | default(False) | bool and not skip_docker_role | default(False) | bool
-
-- name: Configure load balancers
-  hosts: oo_lb_to_config
-  vars:
-    openshift_loadbalancer_frontends: "{{ (openshift_master_api_port | default(8443)
-                                           | oo_openshift_loadbalancer_frontends(hostvars | oo_select_keys(groups['oo_masters']),
-                                                                                 openshift_use_nuage | default(false),
-                                                                                 nuage_mon_rest_server_port | default(none)))
-                                           + openshift_loadbalancer_additional_frontends | default([]) }}"
-    openshift_loadbalancer_backends: "{{ (openshift_master_api_port | default(8443)
-                                          | oo_openshift_loadbalancer_backends(hostvars | oo_select_keys(groups['oo_masters']),
-                                                                               openshift_use_nuage | default(false),
-                                                                               nuage_mon_rest_server_port | default(none)))
-                                          + openshift_loadbalancer_additional_backends | default([]) }}"
-    openshift_image_tag: "{{ hostvars[groups.oo_first_master.0].openshift_image_tag }}"
-  roles:
-  - role: openshift_loadbalancer
-  - role: tuned
-
-- name: Load Balancer Install Checkpoint End
-  hosts: all
-  gather_facts: false
-  tasks:
-  - name: Set load balancer install 'Complete'
-    run_once: true
-    set_stats:
-      data:
-        installer_phase_loadbalancer:
-          status: "Complete"
-          end: "{{ lookup('pipe', 'date +%Y%m%d%H%M%SZ') }}"
diff --git a/playbooks/common/openshift-loadbalancer/filter_plugins b/playbooks/common/openshift-loadbalancer/filter_plugins
deleted file mode 120000
index 99a95e4ca..000000000
--- a/playbooks/common/openshift-loadbalancer/filter_plugins
+++ /dev/null
@@ -1 +0,0 @@
-../../../filter_plugins
\ No newline at end of file
diff --git a/playbooks/common/openshift-loadbalancer/lookup_plugins b/playbooks/common/openshift-loadbalancer/lookup_plugins
deleted file mode 120000
index ac79701db..000000000
--- a/playbooks/common/openshift-loadbalancer/lookup_plugins
+++ /dev/null
@@ -1 +0,0 @@
-../../../lookup_plugins
\ No newline at end of file
diff --git a/playbooks/common/openshift-loadbalancer/roles b/playbooks/common/openshift-loadbalancer/roles
deleted file mode 120000
index e2b799b9d..000000000
--- a/playbooks/common/openshift-loadbalancer/roles
+++ /dev/null
@@ -1 +0,0 @@
-../../../roles/
\ No newline at end of file
diff --git a/playbooks/common/openshift-master/scaleup.yml b/playbooks/common/openshift-master/scaleup.yml
index d070fcf2a..ed54e6ca4 100644
--- a/playbooks/common/openshift-master/scaleup.yml
+++ b/playbooks/common/openshift-master/scaleup.yml
@@ -50,7 +50,7 @@
 
 - include: ../openshift-master/config.yml
 
-- include: ../openshift-loadbalancer/config.yml
+- include: ../../openshift-loadbalancer/private/config.yml
 
 - include: ../../openshift-node/private/certificates.yml