summaryrefslogtreecommitdiffstats
path: root/playbooks/gce
diff options
context:
space:
mode:
authorThomas Wiest <twiest@users.noreply.github.com>2015-03-06 10:00:31 -0500
committerThomas Wiest <twiest@users.noreply.github.com>2015-03-06 10:00:31 -0500
commit3aed7219448ab99377643c71d05f2a26b6e11c99 (patch)
treeb8f16225ad95f5692fca3d4c61c9f5f6235c732b /playbooks/gce
parentfbf0302567cfd019a762d9c37f8c10b65b269768 (diff)
parentb7008f070afe2629c9ebcbbdf0af3fa1f6ed9d34 (diff)
downloadopenshift-3aed7219448ab99377643c71d05f2a26b6e11c99.tar.gz
openshift-3aed7219448ab99377643c71d05f2a26b6e11c99.tar.bz2
openshift-3aed7219448ab99377643c71d05f2a26b6e11c99.tar.xz
openshift-3aed7219448ab99377643c71d05f2a26b6e11c99.zip
Merge pull request #94 from detiber/iptables
Add iptables firewall support to openshift-common
Diffstat (limited to 'playbooks/gce')
-rw-r--r--playbooks/gce/openshift-master/config.yml2
-rw-r--r--playbooks/gce/openshift-node/config.yml2
2 files changed, 2 insertions, 2 deletions
diff --git a/playbooks/gce/openshift-master/config.yml b/playbooks/gce/openshift-master/config.yml
index 1c7dea3ca..7e754074b 100644
--- a/playbooks/gce/openshift-master/config.yml
+++ b/playbooks/gce/openshift-master/config.yml
@@ -31,7 +31,6 @@
vars_files:
- vars.yml
roles:
- - base_os
- repos
- {
role: openshift_master,
@@ -40,3 +39,4 @@
openshift_env: "{{ oo_env }}",
}
- pods
+ - os_env_extras
diff --git a/playbooks/gce/openshift-node/config.yml b/playbooks/gce/openshift-node/config.yml
index adfad5d7e..85f34e814 100644
--- a/playbooks/gce/openshift-node/config.yml
+++ b/playbooks/gce/openshift-node/config.yml
@@ -37,7 +37,6 @@
vars_files:
- vars.yml
roles:
- - base_os
- repos
- docker
- {
@@ -47,3 +46,4 @@
openshift_public_ip: "{{ gce_public_ip }}",
openshift_env: "{{ oo_env }}",
}
+ - os_env_extras