summaryrefslogtreecommitdiffstats
path: root/playbooks/openshift-node/private
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2018-01-08 11:22:35 -0800
committerGitHub <noreply@github.com>2018-01-08 11:22:35 -0800
commitf820b59003dc703886d20d9c702f370a9c7ede64 (patch)
tree08aecf4f87da5f2e69ef690f94628780869838a0 /playbooks/openshift-node/private
parentfe2dbc1d9524b707288bc639e7e2bf71290dbe0b (diff)
parent8f5b8292e5a645820e83dc2537e4d36c696b67ce (diff)
downloadopenshift-f820b59003dc703886d20d9c702f370a9c7ede64.tar.gz
openshift-f820b59003dc703886d20d9c702f370a9c7ede64.tar.bz2
openshift-f820b59003dc703886d20d9c702f370a9c7ede64.tar.xz
openshift-f820b59003dc703886d20d9c702f370a9c7ede64.zip
Merge pull request #6549 from mgugino-upstream-stage/node-meta-depends2
Automatic merge from submit-queue. Remove last of openshift_node role meta-depends Remove last non-taskless meta-depends from openshift_node role.
Diffstat (limited to 'playbooks/openshift-node/private')
-rw-r--r--playbooks/openshift-node/private/configure_nodes.yml1
-rw-r--r--playbooks/openshift-node/private/containerized_nodes.yml1
2 files changed, 2 insertions, 0 deletions
diff --git a/playbooks/openshift-node/private/configure_nodes.yml b/playbooks/openshift-node/private/configure_nodes.yml
index 548ff7c4f..a13173e63 100644
--- a/playbooks/openshift-node/private/configure_nodes.yml
+++ b/playbooks/openshift-node/private/configure_nodes.yml
@@ -11,6 +11,7 @@
}}"
roles:
- role: openshift_clock
+ - role: openshift_cloud_provider
- role: openshift_node
- role: tuned
- role: nickhammond.logrotate
diff --git a/playbooks/openshift-node/private/containerized_nodes.yml b/playbooks/openshift-node/private/containerized_nodes.yml
index dc68d7585..644e6a69c 100644
--- a/playbooks/openshift-node/private/containerized_nodes.yml
+++ b/playbooks/openshift-node/private/containerized_nodes.yml
@@ -13,6 +13,7 @@
roles:
- role: openshift_clock
+ - role: openshift_cloud_provider
- role: openshift_node
openshift_ca_host: "{{ groups.oo_first_master.0 }}"
- role: nickhammond.logrotate