From f5b3f9d22b270026ab0f91ced737934e8c4d3b50 Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Tue, 7 Mar 2023 10:55:03 +0100 Subject: [PATCH] ironic: fix dev mode for inspector Change-Id: I1649a389bdc3977b936402c3ce3e55056d74ba08 --- ansible/roles/ironic/defaults/main.yml | 4 +++- ansible/roles/ironic/tasks/clone.yml | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ansible/roles/ironic/defaults/main.yml b/ansible/roles/ironic/defaults/main.yml index 7684cf97a0..d37b36b0fa 100644 --- a/ansible/roles/ironic/defaults/main.yml +++ b/ansible/roles/ironic/defaults/main.yml @@ -238,7 +238,7 @@ ironic_inspector_default_volumes: - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}" - "kolla_logs:/var/log/kolla" - "ironic_inspector_dhcp_hosts:/var/lib/ironic-inspector/dhcp-hostsdir" - - "{{ kolla_dev_repos_directory ~ '/ironic-inspector/ironic_inspector:/var/lib/kolla/venv/lib/python' ~ distro_python_version ~ '/site-packages/ironic_inspector' if ironic_dev_mode | bool else '' }}" + - "{{ kolla_dev_repos_directory ~ '/ironic-inspector/ironic_inspector:/var/lib/kolla/venv/lib/python' ~ distro_python_version ~ '/site-packages/ironic_inspector' if ironic_inspector_dev_mode | bool else '' }}" ironic_dnsmasq_default_volumes: - "{{ node_config_directory }}/ironic-dnsmasq/:{{ container_config_directory }}/:ro" - "/etc/localtime:/etc/localtime:ro" @@ -295,7 +295,9 @@ ironic_inspector_git_repository: "{{ kolla_dev_repos_git }}/ironic-inspector" ironic_git_repository: "{{ kolla_dev_repos_git }}/{{ project_name }}" ironic_dev_repos_pull: "{{ kolla_dev_repos_pull }}" ironic_dev_mode: "{{ kolla_dev_mode }}" +ironic_inspector_dev_mode: "{{ ironic_dev_mode }}" ironic_source_version: "{{ kolla_source_version }}" +ironic_inspector_source_version: "{{ ironic_source_version }}" #################### diff --git a/ansible/roles/ironic/tasks/clone.yml b/ansible/roles/ironic/tasks/clone.yml index 0dc10862f1..51ca6a221b 100644 --- a/ansible/roles/ironic/tasks/clone.yml +++ b/ansible/roles/ironic/tasks/clone.yml @@ -13,4 +13,5 @@ repo: "{{ ironic_inspector_git_repository }}" dest: "{{ kolla_dev_repos_directory }}/ironic-inspector" update: "{{ ironic_dev_repos_pull }}" - version: "{{ ironic_source_version }}" + version: "{{ ironic_inspector_source_version }}" + when: ironic_inspector_dev_mode | bool