summaryrefslogtreecommitdiffstats
path: root/playbooks/gce
diff options
context:
space:
mode:
authorThomas Wiest <twiest@users.noreply.github.com>2015-03-24 09:42:43 -0400
committerThomas Wiest <twiest@users.noreply.github.com>2015-03-24 09:42:43 -0400
commit1686e24048b34d365e740f72ab9ad1962c26da2c (patch)
tree3544b51039f726813df733142a82f518a33259cc /playbooks/gce
parentfceb54d257ec0e645533e9f20d002f559433662a (diff)
parent8613b70503d2d1cbe57ddebc11919edeb26eaadc (diff)
downloadopenshift-1686e24048b34d365e740f72ab9ad1962c26da2c.tar.gz
openshift-1686e24048b34d365e740f72ab9ad1962c26da2c.tar.bz2
openshift-1686e24048b34d365e740f72ab9ad1962c26da2c.tar.xz
openshift-1686e24048b34d365e740f72ab9ad1962c26da2c.zip
Merge pull request #117 from detiber/repoRename
Rename repos role to openshift_repos
Diffstat (limited to 'playbooks/gce')
-rw-r--r--playbooks/gce/openshift-master/config.yml1
-rw-r--r--playbooks/gce/openshift-node/config.yml3
2 files changed, 1 insertions, 3 deletions
diff --git a/playbooks/gce/openshift-master/config.yml b/playbooks/gce/openshift-master/config.yml
index ae598b622..a74250d13 100644
--- a/playbooks/gce/openshift-master/config.yml
+++ b/playbooks/gce/openshift-master/config.yml
@@ -31,7 +31,6 @@
vars_files:
- vars.yml
roles:
- - repos
- {
role: openshift_master,
openshift_node_ips: "{{ hostvars['localhost'].openshift_node_ips | default(['']) }}",
diff --git a/playbooks/gce/openshift-node/config.yml b/playbooks/gce/openshift-node/config.yml
index 85f34e814..78047cf40 100644
--- a/playbooks/gce/openshift-node/config.yml
+++ b/playbooks/gce/openshift-node/config.yml
@@ -37,8 +37,6 @@
vars_files:
- vars.yml
roles:
- - repos
- - docker
- {
role: openshift_node,
openshift_master_ips: "{{ hostvars['localhost'].openshift_master_ips | default(['']) }}",
@@ -46,4 +44,5 @@
openshift_public_ip: "{{ gce_public_ip }}",
openshift_env: "{{ oo_env }}",
}
+ - docker
- os_env_extras