diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-11-21 14:27:43 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-21 14:27:43 -0500 |
| commit | c4c3b29396b13cd9e9ba93543f96967c89d81c42 (patch) | |
| tree | 83db7f6169cdff2ec3de8d8273b88aa2ece2ef1e /playbooks | |
| parent | 65464f64236ea0aad56e2be5ece34412ad60f919 (diff) | |
| parent | 98815e010d29c670ff15aecf5dd15fb1241c76f0 (diff) | |
| download | openshift-c4c3b29396b13cd9e9ba93543f96967c89d81c42.tar.gz openshift-c4c3b29396b13cd9e9ba93543f96967c89d81c42.tar.bz2 openshift-c4c3b29396b13cd9e9ba93543f96967c89d81c42.tar.xz openshift-c4c3b29396b13cd9e9ba93543f96967c89d81c42.zip | |
Merge pull request #6148 from mtnbikenc/consolidate-openshift-nfs
Playbook Consolidation - openshift-nfs
Diffstat (limited to 'playbooks')
| -rw-r--r-- | playbooks/aws/openshift-cluster/install.yml | 2 | ||||
| -rw-r--r-- | playbooks/byo/openshift-nfs/config.yml | 4 | ||||
| -rw-r--r-- | playbooks/common/openshift-cluster/config.yml | 2 | ||||
| -rw-r--r-- | playbooks/openshift-nfs/config.yml | 4 | ||||
| -rw-r--r-- | playbooks/openshift-nfs/private/config.yml (renamed from playbooks/common/openshift-nfs/config.yml) | 0 | ||||
| l--------- | playbooks/openshift-nfs/private/filter_plugins (renamed from playbooks/common/openshift-nfs/filter_plugins) | 0 | ||||
| l--------- | playbooks/openshift-nfs/private/lookup_plugins (renamed from playbooks/common/openshift-nfs/lookup_plugins) | 0 | ||||
| l--------- | playbooks/openshift-nfs/private/roles (renamed from playbooks/common/openshift-nfs/roles) | 0 |
8 files changed, 6 insertions, 6 deletions
diff --git a/playbooks/aws/openshift-cluster/install.yml b/playbooks/aws/openshift-cluster/install.yml index 874d2d38a..87863b767 100644 --- a/playbooks/aws/openshift-cluster/install.yml +++ b/playbooks/aws/openshift-cluster/install.yml @@ -25,7 +25,7 @@ include: ../../common/openshift-etcd/config.yml - name: include nfs - include: ../../common/openshift-nfs/config.yml + include: ../../openshift-nfs/private/config.yml when: groups.oo_nfs_to_config | default([]) | count > 0 - name: include loadbalancer diff --git a/playbooks/byo/openshift-nfs/config.yml b/playbooks/byo/openshift-nfs/config.yml deleted file mode 100644 index a5e6fe784..000000000 --- a/playbooks/byo/openshift-nfs/config.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -- include: ../../init/main.yml - -- include: ../../common/openshift-nfs/config.yml diff --git a/playbooks/common/openshift-cluster/config.yml b/playbooks/common/openshift-cluster/config.yml index 588291878..ad10ba821 100644 --- a/playbooks/common/openshift-cluster/config.yml +++ b/playbooks/common/openshift-cluster/config.yml @@ -3,7 +3,7 @@ - include: ../openshift-etcd/config.yml -- include: ../openshift-nfs/config.yml +- include: ../../openshift-nfs/private/config.yml when: groups.oo_nfs_to_config | default([]) | count > 0 - include: ../openshift-loadbalancer/config.yml diff --git a/playbooks/openshift-nfs/config.yml b/playbooks/openshift-nfs/config.yml new file mode 100644 index 000000000..8ee57ce8d --- /dev/null +++ b/playbooks/openshift-nfs/config.yml @@ -0,0 +1,4 @@ +--- +- include: ../init/main.yml + +- include: private/config.yml diff --git a/playbooks/common/openshift-nfs/config.yml b/playbooks/openshift-nfs/private/config.yml index 6ea77e00b..6ea77e00b 100644 --- a/playbooks/common/openshift-nfs/config.yml +++ b/playbooks/openshift-nfs/private/config.yml diff --git a/playbooks/common/openshift-nfs/filter_plugins b/playbooks/openshift-nfs/private/filter_plugins index 99a95e4ca..99a95e4ca 120000 --- a/playbooks/common/openshift-nfs/filter_plugins +++ b/playbooks/openshift-nfs/private/filter_plugins diff --git a/playbooks/common/openshift-nfs/lookup_plugins b/playbooks/openshift-nfs/private/lookup_plugins index ac79701db..ac79701db 120000 --- a/playbooks/common/openshift-nfs/lookup_plugins +++ b/playbooks/openshift-nfs/private/lookup_plugins diff --git a/playbooks/common/openshift-nfs/roles b/playbooks/openshift-nfs/private/roles index e2b799b9d..e2b799b9d 120000 --- a/playbooks/common/openshift-nfs/roles +++ b/playbooks/openshift-nfs/private/roles |