diff options
| author | Thomas Wiest <twiest@users.noreply.github.com> | 2015-03-06 10:00:31 -0500 |
|---|---|---|
| committer | Thomas Wiest <twiest@users.noreply.github.com> | 2015-03-06 10:00:31 -0500 |
| commit | 3aed7219448ab99377643c71d05f2a26b6e11c99 (patch) | |
| tree | b8f16225ad95f5692fca3d4c61c9f5f6235c732b /playbooks | |
| parent | fbf0302567cfd019a762d9c37f8c10b65b269768 (diff) | |
| parent | b7008f070afe2629c9ebcbbdf0af3fa1f6ed9d34 (diff) | |
| download | openshift-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')
| -rw-r--r-- | playbooks/aws/ansible-tower/config.yml | 2 | ||||
| -rw-r--r-- | playbooks/aws/openshift-master/config.yml | 2 | ||||
| -rw-r--r-- | playbooks/aws/openshift-node/config.yml | 2 | ||||
| -rw-r--r-- | playbooks/gce/openshift-master/config.yml | 2 | ||||
| -rw-r--r-- | playbooks/gce/openshift-node/config.yml | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/playbooks/aws/ansible-tower/config.yml b/playbooks/aws/ansible-tower/config.yml index 30a27d0e0..efd1b9911 100644 --- a/playbooks/aws/ansible-tower/config.yml +++ b/playbooks/aws/ansible-tower/config.yml @@ -16,7 +16,7 @@ - vars.yml - "vars.{{ oo_env }}.yml" roles: - - base_os - os_ipv6_disable - ansible - ansible_tower + - os_env_extras diff --git a/playbooks/aws/openshift-master/config.yml b/playbooks/aws/openshift-master/config.yml index a8f7e25a5..c88828912 100644 --- a/playbooks/aws/openshift-master/config.yml +++ b/playbooks/aws/openshift-master/config.yml @@ -31,7 +31,6 @@ vars_files: - vars.yml roles: - - base_os - repos - { role: openshift_master, @@ -40,3 +39,4 @@ # TODO: openshift_public_ip: set to aws instance public ip } - pods + - os_env_extras diff --git a/playbooks/aws/openshift-node/config.yml b/playbooks/aws/openshift-node/config.yml index f68041843..129464e1f 100644 --- a/playbooks/aws/openshift-node/config.yml +++ b/playbooks/aws/openshift-node/config.yml @@ -31,7 +31,6 @@ vars_files: - vars.yml roles: - - base_os - repos - docker - { @@ -41,3 +40,4 @@ openshift_env: "{{ oo_env }}" # TODO: openshift_public_ip: set to aws instance public ip } + - os_env_extras 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 |