diff options
| author | Devan Goodwin <dgoodwin@redhat.com> | 2016-06-06 08:48:05 -0300 |
|---|---|---|
| committer | Devan Goodwin <dgoodwin@redhat.com> | 2016-06-06 08:48:05 -0300 |
| commit | 81cb935e1817df4c633397680e963d635ed42e26 (patch) | |
| tree | dd595fab3ae4cc8f5d47dcc2297ff34def6f571c /roles/cockpit | |
| parent | 0514bdffca4e06144f4f81db037490d2c0fede40 (diff) | |
| parent | 6fb6e059dc50fcdc2480c06cfcf0a45674283725 (diff) | |
| download | openshift-81cb935e1817df4c633397680e963d635ed42e26.tar.gz openshift-81cb935e1817df4c633397680e963d635ed42e26.tar.bz2 openshift-81cb935e1817df4c633397680e963d635ed42e26.tar.xz openshift-81cb935e1817df4c633397680e963d635ed42e26.zip | |
Merge remote-tracking branch 'upstream/master' into upgrade33
Diffstat (limited to 'roles/cockpit')
| -rw-r--r-- | roles/cockpit/defaults/main.yml | 4 | ||||
| -rw-r--r-- | roles/cockpit/meta/main.yml | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/roles/cockpit/defaults/main.yml b/roles/cockpit/defaults/main.yml deleted file mode 100644 index 9cf665841..000000000 --- a/roles/cockpit/defaults/main.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -os_firewall_allow: -- service: cockpit-ws - port: 9090/tcp diff --git a/roles/cockpit/meta/main.yml b/roles/cockpit/meta/main.yml index 1e3948b19..43047902d 100644 --- a/roles/cockpit/meta/main.yml +++ b/roles/cockpit/meta/main.yml @@ -12,4 +12,7 @@ galaxy_info: categories: - cloud dependencies: - - { role: os_firewall } +- role: os_firewall + os_firewall_allow: + - service: cockpit-ws + port: 9090/tcp |