From 4c7fb49c2b199b7162b46cb7e8cfc61a1fc250c0 Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotjagov Date: Thu, 21 Mar 2019 20:16:40 +0200 Subject: [PATCH] Rename masakari_venv_pip_packages to exclude from repo_build process Variable masakari_venv_pip_packages was renamed in order to exclude from repo-build process, as it fails in case of Jinja inside *_pip_packages. As this variable collects all other *_pip_packages lists, repo_build will still have all mentioned packages, so it's safe to rename this var. Change-Id: Ib33d7bc83f1428763f873e1155fd9e3eb4c937e4 --- tasks/masakari_install.yml | 2 +- vars/main.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tasks/masakari_install.yml b/tasks/masakari_install.yml index 20b60f8..1b69787 100644 --- a/tasks/masakari_install.yml +++ b/tasks/masakari_install.yml @@ -44,7 +44,7 @@ {{ ('masakari_monitor' in group_names) | ternary(masakari_monitor_distro_packages, masakari_distro_packages) }} venv_build_distro_package_list: "{{ masakari_devel_distro_packages }}" venv_pip_install_args: "{{ masakari_pip_install_args }}" - venv_pip_packages: "{{ masakari_venv_pip_packages }}" + venv_pip_packages: "{{ masakari_pip_venv_packages }}" venv_facts_when_changed: - section: "masakari" option: "venv_tag" diff --git a/vars/main.yml b/vars/main.yml index a48f688..774c97b 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -masakari_venv_pip_packages: |- +masakari_pip_venv_packages: |- {% set pip_packages = [] %} {% if masakari_services['masakari-api']['group'] in group_names or masakari_services['masakari-engine']['group'] in group_names %} {% set _ = pip_packages.extend(masakari_pip_packages) %}