diff options
| author | Russell Teague <rteague@redhat.com> | 2017-11-16 15:06:33 -0500 |
|---|---|---|
| committer | Russell Teague <rteague@redhat.com> | 2017-11-16 15:12:56 -0500 |
| commit | c4090eee0df028f768eb669a04d9cbdc66e93209 (patch) | |
| tree | 4c7b699024f221406375f5af6fd82b039b3b1485 /playbooks | |
| parent | 7a18158c1df667d2bc45fae3ca62ed35400bedb8 (diff) | |
| download | openshift-c4090eee0df028f768eb669a04d9cbdc66e93209.tar.gz openshift-c4090eee0df028f768eb669a04d9cbdc66e93209.tar.bz2 openshift-c4090eee0df028f768eb669a04d9cbdc66e93209.tar.xz openshift-c4090eee0df028f768eb669a04d9cbdc66e93209.zip | |
Playbook Consolidation - openshift-metrics
Diffstat (limited to 'playbooks')
| -rw-r--r-- | playbooks/aws/openshift-cluster/hosted.yml | 2 | ||||
| -rw-r--r-- | playbooks/byo/openshift-cluster/openshift-metrics.yml | 4 | ||||
| -rw-r--r-- | playbooks/common/openshift-cluster/config.yml | 2 | ||||
| -rw-r--r-- | playbooks/openshift-metrics/config.yml | 4 | ||||
| -rw-r--r-- | playbooks/openshift-metrics/private/config.yml (renamed from playbooks/common/openshift-cluster/openshift_metrics.yml) | 0 | ||||
| l--------- | playbooks/openshift-metrics/private/library | 1 | ||||
| l--------- | playbooks/openshift-metrics/private/roles | 1 |
7 files changed, 8 insertions, 6 deletions
diff --git a/playbooks/aws/openshift-cluster/hosted.yml b/playbooks/aws/openshift-cluster/hosted.yml index db6e3b8e1..3d3c871ca 100644 --- a/playbooks/aws/openshift-cluster/hosted.yml +++ b/playbooks/aws/openshift-cluster/hosted.yml @@ -1,7 +1,7 @@ --- - include: ../../common/openshift-cluster/openshift_hosted.yml -- include: ../../common/openshift-cluster/openshift_metrics.yml +- include: ../../openshift-metrics/private/config.yml when: openshift_metrics_install_metrics | default(false) | bool - include: ../../common/openshift-cluster/openshift_logging.yml diff --git a/playbooks/byo/openshift-cluster/openshift-metrics.yml b/playbooks/byo/openshift-cluster/openshift-metrics.yml deleted file mode 100644 index e4c9ba1f7..000000000 --- a/playbooks/byo/openshift-cluster/openshift-metrics.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -- include: ../../init/main.yml - -- include: ../../common/openshift-cluster/openshift_metrics.yml diff --git a/playbooks/common/openshift-cluster/config.yml b/playbooks/common/openshift-cluster/config.yml index 3b4d6f9a6..dfeda4c4d 100644 --- a/playbooks/common/openshift-cluster/config.yml +++ b/playbooks/common/openshift-cluster/config.yml @@ -20,7 +20,7 @@ - include: openshift_hosted.yml -- include: openshift_metrics.yml +- include: ../../openshift-metrics/private/config.yml when: openshift_metrics_install_metrics | default(false) | bool - include: openshift_logging.yml diff --git a/playbooks/openshift-metrics/config.yml b/playbooks/openshift-metrics/config.yml new file mode 100644 index 000000000..8ee57ce8d --- /dev/null +++ b/playbooks/openshift-metrics/config.yml @@ -0,0 +1,4 @@ +--- +- include: ../init/main.yml + +- include: private/config.yml diff --git a/playbooks/common/openshift-cluster/openshift_metrics.yml b/playbooks/openshift-metrics/private/config.yml index 80cd93e5f..80cd93e5f 100644 --- a/playbooks/common/openshift-cluster/openshift_metrics.yml +++ b/playbooks/openshift-metrics/private/config.yml diff --git a/playbooks/openshift-metrics/private/library b/playbooks/openshift-metrics/private/library new file mode 120000 index 000000000..ba40d2f56 --- /dev/null +++ b/playbooks/openshift-metrics/private/library @@ -0,0 +1 @@ +../../../library
\ No newline at end of file diff --git a/playbooks/openshift-metrics/private/roles b/playbooks/openshift-metrics/private/roles new file mode 120000 index 000000000..20c4c58cf --- /dev/null +++ b/playbooks/openshift-metrics/private/roles @@ -0,0 +1 @@ +../../../roles
\ No newline at end of file |