diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-04-25 15:31:18 -0400 |
|---|---|---|
| committer | Scott Dodson <sdodson@redhat.com> | 2016-04-25 15:31:18 -0400 |
| commit | 337b9e4a842cfd7ec6705fd1501cc9c2991a694f (patch) | |
| tree | 67bdb2c745ecc736de7b62df50095a5b3cc59176 /roles/openshift_master/meta | |
| parent | b90fb397908c4e5f9001724e7f8ddcc25f4ffdea (diff) | |
| parent | 3262718f8fc4658a3b223823244f1f78cb0eb6c8 (diff) | |
| download | openshift-337b9e4a842cfd7ec6705fd1501cc9c2991a694f.tar.gz openshift-337b9e4a842cfd7ec6705fd1501cc9c2991a694f.tar.bz2 openshift-337b9e4a842cfd7ec6705fd1501cc9c2991a694f.tar.xz openshift-337b9e4a842cfd7ec6705fd1501cc9c2991a694f.zip | |
Merge branch 'master' into issue1800
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 |