diff options
| author | Russell Teague <rteague@redhat.com> | 2017-11-22 08:28:39 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-22 08:28:39 -0500 |
| commit | 16e4acfe143e954c07c774c5c163fbd4ff1e4647 (patch) | |
| tree | 85bd1bde9394a52731585caac94fc781c04820d9 /playbooks | |
| parent | c1c4f92cdfce46945fdf51d0219980134b73861f (diff) | |
| parent | fcec6bc2caad1f9b84666fc5b17d0af6658b7999 (diff) | |
| download | openshift-16e4acfe143e954c07c774c5c163fbd4ff1e4647.tar.gz openshift-16e4acfe143e954c07c774c5c163fbd4ff1e4647.tar.bz2 openshift-16e4acfe143e954c07c774c5c163fbd4ff1e4647.tar.xz openshift-16e4acfe143e954c07c774c5c163fbd4ff1e4647.zip | |
Merge pull request #6146 from mtnbikenc/consolidate-openshift-loadbalancer
Playbook Consolidation - openshift-loadbalancer
Diffstat (limited to 'playbooks')
| -rw-r--r-- | playbooks/aws/openshift-cluster/install.yml | 2 | ||||
| -rw-r--r-- | playbooks/byo/openshift-loadbalancer/config.yml | 4 | ||||
| -rw-r--r-- | playbooks/common/openshift-cluster/config.yml | 2 | ||||
| l--------- | playbooks/common/openshift-loadbalancer/roles | 1 | ||||
| -rw-r--r-- | playbooks/common/openshift-master/scaleup.yml | 2 | ||||
| -rw-r--r-- | playbooks/openshift-loadbalancer/config.yml | 4 | ||||
| -rw-r--r-- | playbooks/openshift-loadbalancer/private/config.yml (renamed from playbooks/common/openshift-loadbalancer/config.yml) | 0 | ||||
| l--------- | playbooks/openshift-loadbalancer/private/filter_plugins (renamed from playbooks/common/openshift-loadbalancer/filter_plugins) | 0 | ||||
| l--------- | playbooks/openshift-loadbalancer/private/lookup_plugins (renamed from playbooks/common/openshift-loadbalancer/lookup_plugins) | 0 | ||||
| l--------- | playbooks/openshift-loadbalancer/private/roles | 1 |
10 files changed, 8 insertions, 8 deletions
diff --git a/playbooks/aws/openshift-cluster/install.yml b/playbooks/aws/openshift-cluster/install.yml index 3b9f041cf..56ca25eb4 100644 --- a/playbooks/aws/openshift-cluster/install.yml +++ b/playbooks/aws/openshift-cluster/install.yml @@ -29,7 +29,7 @@ when: groups.oo_nfs_to_config | default([]) | count > 0 - name: include loadbalancer - include: ../../common/openshift-loadbalancer/config.yml + include: ../../openshift-loadbalancer/private/config.yml when: groups.oo_lb_to_config | default([]) | count > 0 - name: include openshift-master config diff --git a/playbooks/byo/openshift-loadbalancer/config.yml b/playbooks/byo/openshift-loadbalancer/config.yml deleted file mode 100644 index 27925d2e9..000000000 --- a/playbooks/byo/openshift-loadbalancer/config.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -- include: ../../init/main.yml - -- include: ../../common/openshift-loadbalancer/config.yml 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/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 diff --git a/playbooks/openshift-loadbalancer/config.yml b/playbooks/openshift-loadbalancer/config.yml new file mode 100644 index 000000000..8ee57ce8d --- /dev/null +++ b/playbooks/openshift-loadbalancer/config.yml @@ -0,0 +1,4 @@ +--- +- include: ../init/main.yml + +- include: private/config.yml diff --git a/playbooks/common/openshift-loadbalancer/config.yml b/playbooks/openshift-loadbalancer/private/config.yml index d737b836b..d737b836b 100644 --- a/playbooks/common/openshift-loadbalancer/config.yml +++ b/playbooks/openshift-loadbalancer/private/config.yml diff --git a/playbooks/common/openshift-loadbalancer/filter_plugins b/playbooks/openshift-loadbalancer/private/filter_plugins index 99a95e4ca..99a95e4ca 120000 --- a/playbooks/common/openshift-loadbalancer/filter_plugins +++ b/playbooks/openshift-loadbalancer/private/filter_plugins diff --git a/playbooks/common/openshift-loadbalancer/lookup_plugins b/playbooks/openshift-loadbalancer/private/lookup_plugins index ac79701db..ac79701db 120000 --- a/playbooks/common/openshift-loadbalancer/lookup_plugins +++ b/playbooks/openshift-loadbalancer/private/lookup_plugins diff --git a/playbooks/openshift-loadbalancer/private/roles b/playbooks/openshift-loadbalancer/private/roles new file mode 120000 index 000000000..20c4c58cf --- /dev/null +++ b/playbooks/openshift-loadbalancer/private/roles @@ -0,0 +1 @@ +../../../roles
\ No newline at end of file |