diff options
| author | Devan Goodwin <dgoodwin@redhat.com> | 2016-05-31 10:05:14 -0300 |
|---|---|---|
| committer | Devan Goodwin <dgoodwin@redhat.com> | 2016-05-31 10:05:14 -0300 |
| commit | a7f71eab952e574db89ae9cac2e15922443db048 (patch) | |
| tree | 9688f26cef8d6a7a96146a0f0396ca30d23ffadf /roles/openshift_node/meta | |
| parent | 4a97c9d0f7409b2be90964647f5712e51df37242 (diff) | |
| parent | a24ee80575da72d07dfd1a2cbbc60c91b8c2c256 (diff) | |
| download | openshift-a7f71eab952e574db89ae9cac2e15922443db048.tar.gz openshift-a7f71eab952e574db89ae9cac2e15922443db048.tar.bz2 openshift-a7f71eab952e574db89ae9cac2e15922443db048.tar.xz openshift-a7f71eab952e574db89ae9cac2e15922443db048.zip | |
Merge remote-tracking branch 'upstream/master' into upgrade33
Diffstat (limited to 'roles/openshift_node/meta')
| -rw-r--r-- | roles/openshift_node/meta/main.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/openshift_node/meta/main.yml b/roles/openshift_node/meta/main.yml index ea52bbb99..31547b846 100644 --- a/roles/openshift_node/meta/main.yml +++ b/roles/openshift_node/meta/main.yml @@ -14,9 +14,9 @@ galaxy_info: dependencies: - role: openshift_clock - role: openshift_docker -- role: openshift_node_certificates - role: openshift_cloud_provider - role: openshift_common - role: openshift_node_dnsmasq when: openshift.common.use_dnsmasq - role: os_firewall + |