Skip to content

Commit

Permalink
Run kubernetes plays on the kubernetes worker (#954)
Browse files Browse the repository at this point in the history
Signed-off-by: Christian Berendt <[email protected]>
  • Loading branch information
berendt authored Jul 10, 2024
1 parent 911a832 commit ac404ee
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
8 changes: 7 additions & 1 deletion osism/commands/apply.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

from osism.core import enums
from osism.core.playbooks import MAP_ROLE2ENVIRONMENT, MAP_ROLE2RUNTIME
from osism.tasks import ansible, ceph, kolla, handle_task
from osism.tasks import ansible, ceph, kolla, kubernetes, handle_task


class Run(Command):
Expand Down Expand Up @@ -322,6 +322,12 @@ def _prepare_task(
t = ceph.run.si(
environment, role, arguments, auto_release_time=task_timeout
)
elif environment == "kubernetes":
if sub:
environment = f"{environment}.{sub}"
t = kubernetes.run.si(
environment, role, arguments, auto_release_time=task_timeout
)
elif role == "loadbalancer-ng":
if sub:
environment = f"{environment}.{sub}"
Expand Down
1 change: 1 addition & 0 deletions osism/commands/worker.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ def take_action(self, parsed_args):
tasks = queue
elif queue == "osism-kubernetes":
tasks = "kubernetes"
queue = "kubernetes"
# kolla-ansible, ceph-ansible, osism-ansible
else:
tasks = queue[:-8]
Expand Down

0 comments on commit ac404ee

Please sign in to comment.