diff --git a/defaults/main.yml b/defaults/main.yml
index 6d218a23..c56738d4 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -93,6 +93,7 @@ nova_v21_service_adminuri: "{{ nova_v21_service_proto }}://{{ internal_lb_vip_ad
 nova_v21_service_adminurl: "{{ nova_v21_service_adminuri }}/v2.1"
 nova_v21_service_internaluri: "{{ nova_v21_service_proto }}://{{ internal_lb_vip_address }}:{{ nova_v21_service_port }}"
 nova_v21_service_internalurl: "{{ nova_v21_service_internaluri }}/v2.1"
+nova_v21_enabled: true
 
 ## Nova v2
 nova_service_name: nova
diff --git a/tasks/nova_service_setup.yml b/tasks/nova_service_setup.yml
index 78d10817..a515eb7f 100644
--- a/tasks/nova_service_setup.yml
+++ b/tasks/nova_service_setup.yml
@@ -44,6 +44,8 @@
     service_internalurl: "{{ nova_v21_service_internalurl }}"
     service_adminurl: "{{ nova_v21_service_adminurl }}"
     role_name: "{{ nova_service_role_name }}"
+  when: >
+    nova_v21_enabled == true or nova_v21_enabled == 'True'
   tags:
     - nova-api
     - nova-api-v21
diff --git a/templates/nova.conf.j2 b/templates/nova.conf.j2
index 773aaabb..0b337b1b 100644
--- a/templates/nova.conf.j2
+++ b/templates/nova.conf.j2
@@ -142,7 +142,12 @@ workers = {{ nova_conductor_workers | default(api_threads) }}
 
 
 [osapi_v3]
-enabled = {{ nova_v3_deprecated_but_enabled }}
+# note that this setting enables both the v3 and v2.1 APIs in kilo
+{% if nova_v3_deprecated_but_enabled == true or nova_v3_deprecated_but_enabled == 'True' or nova_v21_enabled == true or nova_v21_enabled == 'True' %}
+enabled = true
+{% else %}
+enabled = false
+{% endif %}
 
 
 [keystone_authtoken]