summaryrefslogtreecommitdiffstats
path: root/playbooks/common/openshift-node
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2016-09-30 14:53:40 -0400
committerGitHub <noreply@github.com>2016-09-30 14:53:40 -0400
commit5746c82c54291aca3f50ee948b49a63d9ae4445b (patch)
tree378eca6a051b2b09ca285d4eec6077e68bb500ef /playbooks/common/openshift-node
parent1ce3ac9c0f31da7536b0136c0424c33eac379ae4 (diff)
parent6826f27769563d30194818a0f13b9da086ddf7ab (diff)
downloadopenshift-5746c82c54291aca3f50ee948b49a63d9ae4445b.tar.gz
openshift-5746c82c54291aca3f50ee948b49a63d9ae4445b.tar.bz2
openshift-5746c82c54291aca3f50ee948b49a63d9ae4445b.tar.xz
openshift-5746c82c54291aca3f50ee948b49a63d9ae4445b.zip
Merge pull request #2475 from smunilla/registry_all_the_time
Install Registry by Default
Diffstat (limited to 'playbooks/common/openshift-node')
-rw-r--r--playbooks/common/openshift-node/config.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/playbooks/common/openshift-node/config.yml b/playbooks/common/openshift-node/config.yml
index f718dbfbd..364a62dd0 100644
--- a/playbooks/common/openshift-node/config.yml
+++ b/playbooks/common/openshift-node/config.yml
@@ -60,12 +60,12 @@
when: "{{ (openshift_http_proxy is defined or openshift_https_proxy is defined) and
openshift_generate_no_proxy_hosts | default(True) | bool }}"
roles:
+ - role: openshift_common
- role: openshift_clock
- role: openshift_docker
- role: openshift_node_certificates
openshift_ca_host: "{{ groups.oo_first_master.0 }}"
- role: openshift_cloud_provider
- - role: openshift_common
- role: openshift_node_dnsmasq
when: openshift.common.use_dnsmasq
- role: os_firewall
@@ -99,12 +99,12 @@
when: "{{ (openshift_http_proxy is defined or openshift_https_proxy is defined) and
openshift_generate_no_proxy_hosts | default(True) | bool }}"
roles:
+ - role: openshift_common
- role: openshift_clock
- role: openshift_docker
- role: openshift_node_certificates
openshift_ca_host: "{{ groups.oo_first_master.0 }}"
- role: openshift_cloud_provider
- - role: openshift_common
- role: openshift_node_dnsmasq
when: openshift.common.use_dnsmasq
- role: os_firewall