diff --git a/tripleo_ansible/roles/octavia_overcloud_config/tasks/flavor.yml b/tripleo_ansible/roles/octavia_overcloud_config/tasks/flavor.yml
new file mode 100644
index 000000000..4c5de59af
--- /dev/null
+++ b/tripleo_ansible/roles/octavia_overcloud_config/tasks/flavor.yml
@@ -0,0 +1,15 @@
+---
+
+- name: create nova flavor for Octavia
+  shell: |
+    if ! openstack flavor show octavia_{{ octavia_flavor_id }} > /dev/null; then
+      openstack flavor create -vv \
+        --id {{ octavia_flavor_id }} \
+        --ram {{ octavia_flavor_properties.ram }} \
+        --disk {{ octavia_flavor_properties.disk }} \
+        --vcpus {{ octavia_flavor_properties.vcpus }} \
+        --private \
+        octavia_{{ octavia_flavor_id }}
+    fi
+  run_once: true
+  when: octavia_manage_nova_flavor | default(false) | bool
diff --git a/tripleo_ansible/roles/octavia_overcloud_config/tasks/main.yml b/tripleo_ansible/roles/octavia_overcloud_config/tasks/main.yml
index 07c7aa3ea..aa9ad65c2 100644
--- a/tripleo_ansible/roles/octavia_overcloud_config/tasks/main.yml
+++ b/tripleo_ansible/roles/octavia_overcloud_config/tasks/main.yml
@@ -5,6 +5,8 @@
 
 - include_tasks: quotas.yml
 
+- include_tasks: flavor.yml
+
 - import_tasks: check_existing_certs.yml
   when:
     - generate_certs | bool