summaryrefslogtreecommitdiffstats
path: root/roles/openshift_master/meta
diff options
context:
space:
mode:
authorJason DeTiberus <detiber@gmail.com>2016-04-25 12:59:20 -0400
committerJason DeTiberus <detiber@gmail.com>2016-04-25 12:59:20 -0400
commit12c2d75d84f76ddd806bffa4e3e4acc0c2f24f95 (patch)
treee3a5a4313adebf617c43be22e61897bc9a19ce41 /roles/openshift_master/meta
parentfb0c88c4246207f8b6132082c8bf67145df9ea01 (diff)
parentb90d2e6e80a7080d1753caba1251505383b998f9 (diff)
downloadopenshift-12c2d75d84f76ddd806bffa4e3e4acc0c2f24f95.tar.gz
openshift-12c2d75d84f76ddd806bffa4e3e4acc0c2f24f95.tar.bz2
openshift-12c2d75d84f76ddd806bffa4e3e4acc0c2f24f95.tar.xz
openshift-12c2d75d84f76ddd806bffa4e3e4acc0c2f24f95.zip
Merge pull request #1385 from sdodson/global-proxy
Global Proxy Config
Diffstat (limited to 'roles/openshift_master/meta')
-rw-r--r--roles/openshift_master/meta/main.yml1
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