diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-12-07 12:05:34 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-07 12:05:34 -0500 |
| commit | 9ee49e03676be3bc51c0f3ec341b1c4f6c1b0008 (patch) | |
| tree | 1441180718861e186a34916b8d01b28bd159ca7e /playbooks/byo | |
| parent | e5faa36d01cba99c2f1e67cfd126f5b5be11d367 (diff) | |
| parent | cccdd4a479273778be44811cbb4b74637aa63476 (diff) | |
| download | openshift-9ee49e03676be3bc51c0f3ec341b1c4f6c1b0008.tar.gz openshift-9ee49e03676be3bc51c0f3ec341b1c4f6c1b0008.tar.bz2 openshift-9ee49e03676be3bc51c0f3ec341b1c4f6c1b0008.tar.xz openshift-9ee49e03676be3bc51c0f3ec341b1c4f6c1b0008.zip | |
Merge pull request #6361 from mtnbikenc/consolidate-deploy-cluster
Playbook Consolidation - byo/config.yml
Diffstat (limited to 'playbooks/byo')
| -rw-r--r-- | playbooks/byo/config.yml | 3 | ||||
| -rw-r--r-- | playbooks/byo/openshift-cluster/config.yml | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/playbooks/byo/config.yml b/playbooks/byo/config.yml index 7d03914a2..4b74e5bce 100644 --- a/playbooks/byo/config.yml +++ b/playbooks/byo/config.yml @@ -1,2 +1,3 @@ --- -- include: openshift-cluster/config.yml +# TODO (rteague): Temporarily leaving this playbook to allow CI tests to operate until CI jobs are updated. +- import_playbook: ../deploy_cluster.yml diff --git a/playbooks/byo/openshift-cluster/config.yml b/playbooks/byo/openshift-cluster/config.yml deleted file mode 100644 index 57823847b..000000000 --- a/playbooks/byo/openshift-cluster/config.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -- include: ../../init/main.yml - -- include: ../../common/openshift-cluster/config.yml |