From 43485eede895d3fd6758ce710b41c065d88c8aa4 Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Mon, 26 Sep 2016 19:39:01 +0100 Subject: [PATCH] Revert dynamic includes for inventory-based conditionals Forcing dynamic includes for inventory-based conditionals results in incomplete execution. Change-Id: Idc5c892ad8c4ab19be0f6952b55b1268ca1ac1a6 --- tasks/main.yml | 3 --- tasks/nova_install.yml | 2 -- 2 files changed, 5 deletions(-) diff --git a/tasks/main.yml b/tasks/main.yml index a6c94642..cb08344b 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -57,15 +57,12 @@ - include: nova_init.yml - include: nova_db_setup.yml - static: no when: inventory_hostname == groups['nova_api_os_compute'][0] - include: nova_service_setup.yml - static: no when: inventory_hostname == groups['nova_api_os_compute'][0] - include: nova_compute.yml - static: no when: inventory_hostname in groups['nova_compute'] tags: - nova-compute diff --git a/tasks/nova_install.yml b/tasks/nova_install.yml index f9b44c40..b0a7969f 100644 --- a/tasks/nova_install.yml +++ b/tasks/nova_install.yml @@ -184,7 +184,6 @@ - nova-pip-packages - include: nova_console_spice_install.yml - static: no when: - inventory_hostname in groups['nova_console'] - nova_console_type == "spice" @@ -192,7 +191,6 @@ - nova-spice-console - include: nova_console_novnc_install.yml - static: no when: - inventory_hostname in groups['nova_console'] - nova_console_type == "novnc"