Skip to content

Commit

Permalink
container: run engine/common roles on first client
Browse files Browse the repository at this point in the history
We already do this in the site-container.yml playbook because we don't
need docker/podman installed on all client nodes and having the
container image only on the first client node.

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
(cherry picked from commit 8ecbdc6)
  • Loading branch information
dsavineau authored and guits committed Sep 10, 2020
1 parent 0c0a930 commit 7745fd3
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 4 deletions.
2 changes: 2 additions & 0 deletions dashboard.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,12 @@
tags: ['ceph_update_config']
- import_role:
name: ceph-container-engine
when: (group_names != ['clients']) or (inventory_hostname == groups.get('clients', [''])|first)
- import_role:
name: ceph-container-common
tasks_from: registry
when:
- (group_names != ['clients']) or (inventory_hostname == groups.get('clients', [''])|first)
- not containerized_deployment | bool
- ceph_docker_registry_auth | bool
- import_role:
Expand Down
11 changes: 7 additions & 4 deletions infrastructure-playbooks/rolling_update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -88,16 +88,17 @@
- import_role:
name: ceph-infra

- import_role:
name: ceph-validate

- import_role:
name: ceph-container-common
tasks_from: registry
when:
- (group_names != ['clients']) or (inventory_hostname == groups.get('clients', [''])|first)
- containerized_deployment | bool
- ceph_docker_registry_auth | bool

- import_role:
name: ceph-validate

- set_fact: rolling_update=true

- name: upgrade ceph mon cluster
Expand Down Expand Up @@ -806,7 +807,9 @@
when: not containerized_deployment | bool
- import_role:
name: ceph-container-common
when: containerized_deployment | bool
when:
- (group_names != ['clients']) or (inventory_hostname == groups.get('clients', [''])|first)
- containerized_deployment | bool
- import_role:
name: ceph-config
- import_role:
Expand Down

0 comments on commit 7745fd3

Please sign in to comment.