Thomas Goirand wrote:
> Justin B Rye <justin.byam....@gmail.com> wrote:
>> Christian PERRIER wrote:
>>> Template: quantum-plugin-openvswitch/enable_tunneling
>>> Type: select
>>> +__Choices: True, False
>>> +Choices-C: True, False
>>> Default: True
>>> _Description: Enable tunneling:
>>> + Please choose whether you want to activate support for GRE
>>> + networks on the server and agents. This requires kernel support for
>>> OVS patch ports and GRE tunneling.
>>>
>>> I don't understand why this template is not a boolean one. Thomas, any
>>> hint?
>>
>> I expect the plan is that version two is going to allow "maybe".
>
> It is because I've been lazy and reproduced the
> values from the config file, so I could get that
> as a return value from Debconf. Feel free to switch
> to a boolean and I will do the necessary programming
> after your review.
A boolean version would be something like this:
Template: quantum-plugin-openvswitch/enable_tunneling
Type: boolean
Default: true
_Description: Enable tunneling?
Please choose whether support should be activated for GRE networks on the
server and agents. This requires kernel support for OVS patch ports and
GRE tunneling.
Alternative patch attached.
--
JBR with qualifications in linguistics, experience as a Debian
sysadmin, and probably no clue about this particular package
Template: quantum-plugin-openvswitch/configure_db
Type: boolean
Default: true
_Description: Set up a database for quantum-plugin-openvswitch?
No database has been set up for quantum-plugin-openvswitch to use. Before
continuing, you should make sure you have the following information:
.
* the type of database that you want to use;
* the database server hostname (that server must allow TCP connections from
this
machine);
* a username and password to access the database.
.
If some of these requirements are missing, do not choose this option and run
with
regular SQLite support.
.
You can change this setting later on by running "dpkg-reconfigure -plow
quantum-plugin-openvswitch".
Template: quantum-plugin-openvswitch/tenant_network_type
Type: select
__Choices: local, gre, vlan, none
Choices-C: local, gre, vlan, none
Default: gre
_Description: Type of network to allocate for tenant networks:
The value "local" is useful only for single-box testing. In order for
tenant networks to provide connectivity between hosts, it is necessary
to either choose "vlan" and then configure "network_vlan_ranges" or to
choose "gre" and then configure "tunnel_id_ranges". Choose "none" to
disable creation of tenant networks.
Template: quantum-plugin-openvswitch/enable_tunneling
Type: boolean
Default: true
_Description: Enable tunneling?
Please choose whether support should be activated for GRE networks on the
server and agents. This requires kernel support for OVS patch ports and
GRE tunneling.
Template: quantum-plugin-openvswitch/tunnel_id_ranges
Type: string
Default: 1:1000
_Description: Tunnel id ranges:
Please enter a comma-separated list of <tun_min>:<tun_max> tuples enumerating
ranges of GRE tunnel IDs that are available for tenant network allocation
if tenant_network_type is "gre".
Template: quantum-plugin-openvswitch/local_ip
Type: string
_Description: Local IP address of this hypervisor:
Please enter the local IP address for this hypervisor.
diff -ru quantum-2013.1.1.pristine/debian/control
quantum-2013.1.1/debian/control
--- quantum-2013.1.1.pristine/debian/control 2013-05-16 09:58:18.000000000
+0100
+++ quantum-2013.1.1/debian/control 2013-06-03 09:03:38.271087699 +0100
@@ -114,7 +114,7 @@
python-sqlalchemy,
python-webob,
Provides: ${python:Provides}
-Description: OpenStack virtual network service - python library
+Description: OpenStack virtual network service - Python library
Quantum provides an API to dynamically request and configure virtual networks.
These networks connect "interfaces" from other OpenStack services (such as
vNICs from Nova VMs). The Quantum API supports extensions to provide advanced
@@ -140,7 +140,7 @@
vNICs from Nova VMs). The Quantum API supports extensions to provide advanced
network capabilities, including QoS, ACLs, and network monitoring.
.
- This package provides the quantum server.
+ This package provides the Quantum server.
Package: quantum-common
Architecture: all
@@ -154,7 +154,7 @@
${python:Depends}
Breaks: quantum-server ( <= 2012.2~rc1~20120907.1154-0ubuntu1 )
Replaces: quantum-server ( <= 2012.2~rc1~20120907.1154-0ubuntu1 )
-Description: OpenStack virtual network service - common
+Description: OpenStack virtual network service - common files
Quantum provides an API to dynamically request and configure virtual networks.
These networks connect "interfaces" from other OpenStack services (such as
vNICs from Nova VMs). The Quantum API supports extensions to provide advanced
@@ -259,7 +259,7 @@
${misc:Depends},
${python:Depends},
${shlibs:Depends}
-Description: Quantum is a virtual network service for Openstack - Brocade
plugin
+Description: OpenStack virtual network service - Brocade plugin
Quantum provides an API to dynamically request and configure virtual networks.
These networks connect "interfaces" from other OpenStack services (such as
vNICs from Nova VMs). The Quantum API supports extensions to provide advanced
@@ -328,7 +328,7 @@
${python:Depends},
${shlibs:Depends},
Recommends: openvswitch-switch
-Description: Quantum is a virtual network service for Openstack - (l3 agent)
+Description: OpenStack virtual network service - l3 agent
Quantum provides an API to dynamically request and configure virtual networks.
These networks connect "interfaces" from other OpenStack services (such as
vNICs from Nova VMs). The Quantum API supports extensions to provide advanced
@@ -347,13 +347,13 @@
${misc:Depends},
${python:Depends},
${shlibs:Depends},
-Description: Quantum is a virtual network service for Openstack - (dhcp agent)
+Description: OpenStack virtual network service - DHCP agent
Quantum provides an API to dynamically request and configure virtual networks.
These networks connect "interfaces" from other OpenStack services (such as
vNICs from Nova VMs). The Quantum API supports extensions to provide advanced
network capabilities, including QoS, ACLs, and network monitoring.
.
- This package provides the dhcp agent.
+ This package provides the DHCP agent.
Package: quantum-metadata-agent
Architecture: all
@@ -364,7 +364,7 @@
${shlibs:Depends}
Breaks: quantum-l3-agent (<< 2013.1)
Replaces: quantum-l3-agent (<< 2013.1)
-Description: Quantum is a virtual network service for Openstack - metadata
agent
+Description: OpenStack virtual network service - metadata agent
Quantum provides an API to dynamically request and configure virtual networks.
These networks connect "interfaces" from other OpenStack services (such as
vNICs from Nova VMs). The Quantum API supports extensions to provide advanced
@@ -382,13 +382,13 @@
${shlibs:Depends}
Breaks: quantum-common ( <= 2012.2~rc1~20120907.1154-0ubuntu1 )
Replaces: quantum-common ( <= 2012.2~rc1~20120907.1154-0ubuntu1 )
-Description: Quantum is a virtual network service for Openstack - LBaaS agent
+Description: OpenStack virtual network service - LBaaS agent
Quantum provides an API to dynamically request and configure virtual networks.
These networks connect "interfaces" from other OpenStack services (such as
vNICs from Nova VMs). The Quantum API supports extensions to provide advanced
network capabilities, including QoS, ACLs, and network monitoring.
.
- This package provides the Load Balancing as-a Service (LBaaS) agent.
+ This package provides the Load Balancing as a Service (LBaaS) agent.
Package: quantum-plugin-openvswitch
Architecture: all
diff -ru quantum-2013.1.1.pristine/debian/quantum-common.templates
quantum-2013.1.1/debian/quantum-common.templates
--- quantum-2013.1.1.pristine/debian/quantum-common.templates 2013-05-16
09:58:18.000000000 +0100
+++ quantum-2013.1.1/debian/quantum-common.templates 2013-06-03
08:21:51.784399883 +0100
@@ -11,8 +11,8 @@
Type: string
Default: 127.0.0.1
_Description: Auth server hostname:
- Please specify the URL of your Quantum authentication server. Typically
- this is also the URL of your OpenStack Identity Service (Keystone).
+ Please specify the hostname of your Quantum authentication server. Typically
+ this is also the hostname of your OpenStack Identity Service (Keystone).
Template: quantum/admin-tenant-name
Type: string
diff -ru quantum-2013.1.1.pristine/debian/quantum-plugin-metaplugin.templates
quantum-2013.1.1/debian/quantum-plugin-metaplugin.templates
--- quantum-2013.1.1.pristine/debian/quantum-plugin-metaplugin.templates
2013-05-16 09:58:18.000000000 +0100
+++ quantum-2013.1.1/debian/quantum-plugin-metaplugin.templates 2013-06-03
08:22:01.480115158 +0100
@@ -10,20 +10,23 @@
Template: quantum-plugin-metaplugin/auth-host
Type: string
Default: 127.0.0.1
-_Description: Auth server hostname:
- Please specify the URL of your Quantum authentication server. Typically
- this is also the URL of your OpenStack Identity Service (Keystone).
+_Description: Authentication server hostname:
+ Please specify the hostname of the authentication server. Typically
+ this is also the hostname of the OpenStack Identity Service (Keystone).
Template: quantum-plugin-metaplugin/admin-tenant-name
Type: string
Default: admin
-_Description: Auth server tenant name:
+_Description: Authentication server tenant name:
+ Please specify the authentication server tenant name.
Template: quantum-plugin-metaplugin/admin-user
Type: string
Default: admin
-_Description: Auth server username:
+_Description: Authentication server username:
+ Please specify the username to use with the authentication server.
Template: quantum-plugin-metaplugin/admin-password
Type: password
-_Description: Auth server password:
+_Description: Authentication server password:
+ Please specify the password to use with the authentication server.
diff -ru quantum-2013.1.1.pristine/debian/quantum-plugin-openvswitch.templates
quantum-2013.1.1/debian/quantum-plugin-openvswitch.templates
--- quantum-2013.1.1.pristine/debian/quantum-plugin-openvswitch.templates
2013-05-16 09:58:18.000000000 +0100
+++ quantum-2013.1.1/debian/quantum-plugin-openvswitch.templates
2013-06-08 19:05:37.614996851 +0100
@@ -3,46 +3,49 @@
Default: true
_Description: Set up a database for quantum-plugin-openvswitch?
No database has been set up for quantum-plugin-openvswitch to use. Before
- continuing, you should make sure you have:
+ continuing, you should make sure you have the following information:
.
- - the server host name (that server must allow TCP connections from this
+ * the type of database that you want to use;
+ * the database server hostname (that server must allow TCP connections from
this
machine);
- - a username and password to access the database.
- - A database type that you want to use.
+ * a username and password to access the database.
.
- If some of these requirements are missing, reject this option and run with
- regular sqlite support.
+ If some of these requirements are missing, do not choose this option and run
with
+ regular SQLite support.
.
- You can change this setting later on by running 'dpkg-reconfigure -plow
- quantum-plugin-openvswitch.
+ You can change this setting later on by running "dpkg-reconfigure -plow
+ quantum-plugin-openvswitch".
Template: quantum-plugin-openvswitch/tenant_network_type
Type: select
-Choices: local, gre, vlan, none
+__Choices: local, gre, vlan, none
+Choices-C: local, gre, vlan, none
Default: gre
_Description: Type of network to allocate for tenant networks:
- The value "local" is useful only for single-box testing and provides no
- connectivity between hosts. You MUST either change this to "vlan" and
- configure network_vlan_ranges below or change this to "gre" and configure
- "tunnel_id_ranges" in order for tenant networks to provide connectivity
- between hosts. Set to "none" to disable creation of tenant networks.
+ The value "local" is useful only for single-box testing. In order for
+ tenant networks to provide connectivity between hosts, it is necessary
+ to either choose "vlan" and then configure "network_vlan_ranges" or to
+ choose "gre" and then configure "tunnel_id_ranges". Choose "none" to
+ disable creation of tenant networks.
Template: quantum-plugin-openvswitch/enable_tunneling
-Type: select
-Choices: True, False
-Default: True
-_Description: Enable tunneling:
- Set to True in the server and the agents to enable support for GRE
- networks. Requires kernel support for OVS patch ports and GRE tunneling.
+Type: boolean
+Default: true
+_Description: Enable tunneling?
+ Please choose whether support should be activated for GRE networks on the
+ server and agents. This requires kernel support for OVS patch ports and
+ GRE tunneling.
Template: quantum-plugin-openvswitch/tunnel_id_ranges
Type: string
Default: 1:1000
_Description: Tunnel id ranges:
- This is a comma-separated list of <tun_min>:<tun_max> tuples enumerating
+ Please enter a comma-separated list of <tun_min>:<tun_max> tuples enumerating
ranges of GRE tunnel IDs that are available for tenant network allocation
if tenant_network_type is "gre".
Template: quantum-plugin-openvswitch/local_ip
Type: string
_Description: Local IP address of this hypervisor:
+ Please enter the local IP address for this hypervisor.
+
diff -ru quantum-2013.1.1.pristine/debian/quantum-server.templates
quantum-2013.1.1/debian/quantum-server.templates
--- quantum-2013.1.1.pristine/debian/quantum-server.templates 2013-05-16
09:58:18.000000000 +0100
+++ quantum-2013.1.1/debian/quantum-server.templates 2013-06-03
08:21:58.508202430 +0100
@@ -1,18 +1,18 @@
Template: quantum/register-endpoint
Type: boolean
Default: false
-_Description: Register Quantum in the keystone endpoint catalog?
- Each Openstack services (each API) should be registered in order to be
+_Description: Register Quantum in the Keystone endpoint catalog?
+ Each OpenStack service (each API) should be registered in order to be
accessible. This is done using "keystone service-create" and "keystone
- endpoint-create". Select if you want to run these commands now.
+ endpoint-create". This can be done automatically now.
.
- Note that you will need to have an up and running keystone server on which to
- connect using the Keystone auth token.
+ Note that you will need to have an up and running Keystone server on which to
+ connect using the Keystone authentication token.
Template: quantum/keystone-ip
Type: string
-_Description: Keystone IP address:
- Enter the IP address of your keystone server, so that quantum-server can
+_Description: Keystone server IP address:
+ Please enter the IP address of the Keystone server, so that quantum-api can
contact Keystone to do the Quantum service and endpoint creation.
Template: quantum/keystone-auth-token
@@ -24,8 +24,7 @@
Template: quantum/endpoint-ip
Type: string
_Description: Quantum endpoint IP address:
- Enter the IP address that will be used to contact Quantum (eg: the Quantum
- endpoint IP address).
+ Please enter the IP address that will be used to contact Quantum.
.
This IP address should be accessible from the clients that will use this
service, so if you are installing a public cloud, this should be a public
@@ -35,6 +34,6 @@
Type: string
Default: regionOne
_Description: Name of the region to register:
- Openstack can be used using availability zones, with each region representing
+ OpenStack supports using availability zones, with each region representing
a location. Please enter the zone that you wish to use when registering the
endpoint.
