Do not manage nova_admin_* options from templates

[openstack-build/neutron-build.git] / trusty / debian / neutron-common.templates

diff --git a/trusty/debian/neutron-common.templates b/trusty/debian/neutron-common.templates
index bda27e0846c49375f670147200e1a74d98bdfc4a..d70480bdf2f6ce4fe935b494672919aab1efeb59 100644 (file)
--- a/trusty/debian/neutron-common.templates
+++ b/trusty/debian/neutron-common.templates
@@ -126,35 +126,3 @@ Template: neutron/local_ip
 Type: string
 _Description: Local IP address of this hypervisor:
  Please enter the local IP address for this hypervisor.
-
-Template: neutron/nova_url
-Type: string
-Default: http://127.0.0.1:8774/v2
-_Description: Nova server URL:
- Please enter the URL of the Nova server.
-
-Template: neutron/nova_region
-Type: string
-Default: regionOne
-_Description: Nova server region name:
- Please enter the region of the Nova server.
-
-Template: neutron/nova_admin_tenant_id
-Type: string
-Default: admin
-_Description: Nova admin tenant ID:
- Neutron needs to be able to communicate with Nova through Keystone. Therefore
- Neutron needs to know the Nova admin tenant ID, username and password.
- .
- Please enter the ID of the admin tenant for Nova.
-
-Template: neutron/nova_admin_username
-Type: string
-Default: admin
-_Description: Neutron administrator username:
- Please enter the username of the Nova administrator.
-
-Template: neutron/nova_admin_password
-Type: password
-_Description: Nova administrator password:
- Please enter the password of the Nova administrator.