diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2016-04-25 16:15:56 -0400 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2016-04-25 16:15:56 -0400 |
| commit | 7cf2ef446cde3f54d4c7095aba20e594c5747630 (patch) | |
| tree | 64e983078a369637ea18c3be10ac1115bfa4ca8c /roles/openshift_master/meta | |
| parent | 407dd1d28f06a3b66c2eeaa05a81279c7704779d (diff) | |
| parent | 3262718f8fc4658a3b223823244f1f78cb0eb6c8 (diff) | |
| download | openshift-7cf2ef446cde3f54d4c7095aba20e594c5747630.tar.gz openshift-7cf2ef446cde3f54d4c7095aba20e594c5747630.tar.bz2 openshift-7cf2ef446cde3f54d4c7095aba20e594c5747630.tar.xz openshift-7cf2ef446cde3f54d4c7095aba20e594c5747630.zip | |
Merge branch 'master' into evac
Diffstat (limited to 'roles/openshift_master/meta')
| -rw-r--r-- | roles/openshift_master/meta/main.yml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/roles/openshift_master/meta/main.yml b/roles/openshift_master/meta/main.yml index 0d4241e2c..e882e0b8b 100644 --- a/roles/openshift_master/meta/main.yml +++ b/roles/openshift_master/meta/main.yml @@ -15,5 +15,6 @@ dependencies: - role: openshift_docker - role: openshift_cli - role: openshift_cloud_provider +- role: openshift_builddefaults - role: openshift_master_facts - role: openshift_hosted_facts |