3 files changed, 7 insertions, 7 deletions
diff --git a/roles/cockpit/defaults/main.yml b/roles/cockpit/defaults/main.yml
deleted file mode 100644
index ffd55f1dd..000000000
--- a/roles/cockpit/defaults/main.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-os_firewall_use_firewalld: false
-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
diff --git a/roles/cockpit/tasks/main.yml b/roles/cockpit/tasks/main.yml
index e83f72a3d..681029332 100644
--- a/roles/cockpit/tasks/main.yml
+++ b/roles/cockpit/tasks/main.yml
@@ -5,11 +5,13 @@
     - cockpit-ws
     - cockpit-shell
     - cockpit-bridge
+    - cockpit-docker
     - "{{ cockpit_plugins }}"
-  when: not openshift.common.is_atomic | bool
+  when: not openshift.common.is_containerized | bool
 
 - name: Enable cockpit-ws
   service:
     name: cockpit.socket
     enabled: true
     state: started
+  when: not openshift.common.is_containerized | bool