diff options
author | Devan Goodwin <dgoodwin@redhat.com> | 2016-05-30 12:55:50 -0300 |
---|---|---|
committer | Devan Goodwin <dgoodwin@redhat.com> | 2016-05-30 12:55:50 -0300 |
commit | f24cc239bcd10d51427a751044b73d1c6470b9b2 (patch) | |
tree | ee5beb65f650c1c76466acb1da11f999504e958b /roles/openshift_master | |
parent | 265daf6b65206fc17ad35e682640477d08efbc43 (diff) | |
parent | 4b734695abf9ca112c9ad3be33f03fcd1a1e7abf (diff) | |
download | openshift-f24cc239bcd10d51427a751044b73d1c6470b9b2.tar.gz openshift-f24cc239bcd10d51427a751044b73d1c6470b9b2.tar.bz2 openshift-f24cc239bcd10d51427a751044b73d1c6470b9b2.tar.xz openshift-f24cc239bcd10d51427a751044b73d1c6470b9b2.zip |
Merge remote-tracking branch 'upstream/master' into upgrade33
Diffstat (limited to 'roles/openshift_master')
-rw-r--r-- | roles/openshift_master/meta/main.yml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/roles/openshift_master/meta/main.yml b/roles/openshift_master/meta/main.yml index d8834d27f..f6b926d74 100644 --- a/roles/openshift_master/meta/main.yml +++ b/roles/openshift_master/meta/main.yml @@ -12,8 +12,10 @@ galaxy_info: categories: - cloud dependencies: +- role: openshift_clock - role: openshift_docker - role: openshift_cli +- role: openshift_master_certificates - role: openshift_cloud_provider - role: openshift_builddefaults - role: openshift_master_facts |