summaryrefslogtreecommitdiffstats
path: root/roles/openshift_hosted
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-12-12 16:30:58 -0500
committerGitHub <noreply@github.com>2017-12-12 16:30:58 -0500
commit1dccaa2ad90b363cf7f2c04d5781693e69451ffb (patch)
treead85fe6d2a1a1bbb8020c4ddc5f71d970d73be1e /roles/openshift_hosted
parente2a6cde4f4e7d4a003950afc388f2cb60414c775 (diff)
parentefe272a51c39c46583ba9a0d2a20644fc251da55 (diff)
downloadopenshift-1dccaa2ad90b363cf7f2c04d5781693e69451ffb.tar.gz
openshift-1dccaa2ad90b363cf7f2c04d5781693e69451ffb.tar.bz2
openshift-1dccaa2ad90b363cf7f2c04d5781693e69451ffb.tar.xz
openshift-1dccaa2ad90b363cf7f2c04d5781693e69451ffb.zip
Merge pull request #6451 from mgugino-upstream-stage/remove-empty-hosted-facts
Remove empty openshift_hosted_facts role
Diffstat (limited to 'roles/openshift_hosted')
-rw-r--r--roles/openshift_hosted/README.md7
-rw-r--r--roles/openshift_hosted/meta/main.yml2
2 files changed, 4 insertions, 5 deletions
diff --git a/roles/openshift_hosted/README.md b/roles/openshift_hosted/README.md
index a1c2c3956..3cf5d97c5 100644
--- a/roles/openshift_hosted/README.md
+++ b/roles/openshift_hosted/README.md
@@ -43,9 +43,9 @@ variables also control configuration behavior:
**NOTE:** Configuring a value for
`openshift_hosted_registry_storage_glusterfs_ips` with a `glusterfs_registry`
-host group is not allowed. Specifying a `glusterfs_registry` host group
-indicates that a new GlusterFS cluster should be configured, whereas
-specifying `openshift_hosted_registry_storage_glusterfs_ips` indicates wanting
+host group is not allowed. Specifying a `glusterfs_registry` host group
+indicates that a new GlusterFS cluster should be configured, whereas
+specifying `openshift_hosted_registry_storage_glusterfs_ips` indicates wanting
to use a pre-configured GlusterFS cluster for the registry storage.
_
@@ -53,7 +53,6 @@ _
Dependencies
------------
-* openshift_hosted_facts
* openshift_persistent_volumes
Example Playbook
diff --git a/roles/openshift_hosted/meta/main.yml b/roles/openshift_hosted/meta/main.yml
index 1d70ef7eb..ac9e241a5 100644
--- a/roles/openshift_hosted/meta/main.yml
+++ b/roles/openshift_hosted/meta/main.yml
@@ -12,6 +12,6 @@ galaxy_info:
categories:
- cloud
dependencies:
-- role: openshift_hosted_facts
+- role: openshift_facts
- role: lib_openshift
- role: lib_os_firewall