From 7cdfdd7f23ede2898d0c68284a3f59c37292e9d3 Mon Sep 17 00:00:00 2001
From: Andrew Butcher <abutcher@redhat.com>
Date: Tue, 16 Feb 2016 10:17:36 -0500
Subject: Add openshift_docker roles to master/node scaleup.

---
 playbooks/common/openshift-master/scaleup.yml | 22 ++++++++++------------
 playbooks/common/openshift-node/scaleup.yml   | 10 ++++++++++
 2 files changed, 20 insertions(+), 12 deletions(-)

(limited to 'playbooks')

diff --git a/playbooks/common/openshift-master/scaleup.yml b/playbooks/common/openshift-master/scaleup.yml
index 52727bc03..6f8151d30 100644
--- a/playbooks/common/openshift-master/scaleup.yml
+++ b/playbooks/common/openshift-master/scaleup.yml
@@ -1,18 +1,6 @@
 ---
 - include: ../openshift-cluster/evaluate_groups.yml
 
-- name: Configure docker hosts
-  hosts: oo_nodes_to_config
-  vars:
-    docker_additional_registries: "{{ lookup('oo_option', 'docker_additional_registries') | oo_split }}"
-    docker_insecure_registries: "{{ lookup('oo_option',  'docker_insecure_registries') | oo_split }}"
-    docker_blocked_registries: "{{ lookup('oo_option', 'docker_blocked_registries') | oo_split }}"
-  roles:
-  - openshift_facts
-  - openshift_docker
-
-- include: ../openshift-node/config.yml
-
 - name: Gather facts
   hosts: oo_etcd_to_config:oo_masters_to_config:oo_nodes_to_config
   roles:
@@ -52,6 +40,16 @@
     delay: 1
     changed_when: false
 
+- name: Configure docker hosts
+  hosts: oo_masters_to-config:oo_nodes_to_config
+  vars:
+    docker_additional_registries: "{{ lookup('oo_option', 'docker_additional_registries') | oo_split }}"
+    docker_insecure_registries: "{{ lookup('oo_option',  'docker_insecure_registries') | oo_split }}"
+    docker_blocked_registries: "{{ lookup('oo_option', 'docker_blocked_registries') | oo_split }}"
+  roles:
+  - openshift_facts
+  - openshift_docker
+
 - include: ../openshift-master/config.yml
 
 - include: ../openshift-node/config.yml
diff --git a/playbooks/common/openshift-node/scaleup.yml b/playbooks/common/openshift-node/scaleup.yml
index 26b792153..d36f7acea 100644
--- a/playbooks/common/openshift-node/scaleup.yml
+++ b/playbooks/common/openshift-node/scaleup.yml
@@ -1,4 +1,14 @@
 ---
 - include: ../openshift-cluster/evaluate_groups.yml
 
+- name: Configure docker hosts
+  hosts: oo_nodes_to_config
+  vars:
+    docker_additional_registries: "{{ lookup('oo_option', 'docker_additional_registries') | oo_split }}"
+    docker_insecure_registries: "{{ lookup('oo_option',  'docker_insecure_registries') | oo_split }}"
+    docker_blocked_registries: "{{ lookup('oo_option', 'docker_blocked_registries') | oo_split }}"
+  roles:
+  - openshift_facts
+  - openshift_docker
+
 - include: ../openshift-node/config.yml
-- 
cgit v1.2.1