diff --git a/tasks/main.yml b/tasks/main.yml
index 3160dc37..a8e2684e 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -67,6 +67,7 @@
 
 - include: octavia_flavor_create.yml
   when:
+    - inventory_hostname == groups['octavia_all'][0]
     - octavia_nova_flavor_uuid is not defined
   tags:
     - octavia-install
diff --git a/tasks/octavia_flavor_create.yml b/tasks/octavia_flavor_create.yml
index fbbd5c66..573ae880 100644
--- a/tasks/octavia_flavor_create.yml
+++ b/tasks/octavia_flavor_create.yml
@@ -29,10 +29,6 @@
     vcpus: "{{ octavia_amp_vcpu }}"
     disk: "{{ octavia_amp_disk }}"
     is_public: False
-  ignore_errors: yes # that module is buggy?
-  when:
-    - octavia_nova_flavor_uuid is not defined
-
 
 - name: Gather Octavia Flavor Id
   os_flavor_facts:
@@ -45,9 +41,6 @@
       project_domain_name: "{{ octavia_service_project_domain_id }}"
     endpoint_type: "{{ octavia_ansible_endpoint_type }}"
     name: "{{ octavia_amp_flavor_name}}"
-  ignore_errors: yes
-  when:
-    - octavia_nova_flavor_uuid is not defined
 
 - name: Set Octavia Flavor UUID fact 1
   set_fact: