Do not manage nova_admin_* options from templates

nova_admin_* options are deprecated and should be replaced with authentication
plugin specific options

Change-Id: I970565117dde7f76e8e1f43d7b03419439d01ad8
Related-bug: #1503753

diff --git a/trusty/debian/changelog b/trusty/debian/changelog
index d64da44f6056b57b0168365dbe3ca02f9cbb342f..709ac76035e750d28cbffceb3b06aafbf58ff55a 100644 (file)
--- a/trusty/debian/changelog
+++ b/trusty/debian/changelog
@@ -1,3 +1,10 @@
+neutron (2:7.0.0-1~u14.04+mos1) mos8.0; urgency=medium
+
+  * Do not manage nova_admin_ options from templates as they are deprecated
+    and should be replaced with authentication plugin specific options
+
+ -- Sergey Kolekonov <skolekonov@mirantis.com>  Fri, 02 Nov 2015 19:51:51 +0300
+
 neutron (2:7.0.0.0b2-1~u14.04+mos2) mos8.0; urgency=medium
 
   * Switch to Ubuntu packages compatible naming scheme

diff --git a/trusty/debian/neutron-common.config.in b/trusty/debian/neutron-common.config.in
index c179765b799db90d1848ad24cc0dc1e948992bfa..ad6da5f9981c679043b3ab275bb1cb5b419c75ce 100644 (file)
--- a/trusty/debian/neutron-common.config.in
+++ b/trusty/debian/neutron-common.config.in
@@ -84,14 +84,6 @@ db_go
 db_get neutron/plugin-select
 NEUTRON_PLUGIN_NAME=${RET}
 
-read_nova_admin_credentials () {
-       pkgos_read_config -p high ${N_CONF} DEFAULT nova_url neutron/nova_url
-       pkgos_read_config -p high ${N_CONF} DEFAULT nova_region_name neutron/nova_region
-       pkgos_read_config -p medium ${N_CONF} DEFAULT nova_admin_tenant_id neutron/nova_admin_tenant_id
-       pkgos_read_config -p medium ${N_CONF} DEFAULT nova_admin_username neutron/nova_admin_username
-       pkgos_read_config -p high ${N_CONF} DEFAULT nova_admin_password neutron/nova_admin_password
-}
-
 # OVS specific configurations (if that's the one selected)
 if [ "${NEUTRON_PLUGIN_NAME}" = "OpenVSwitch" ] ; then
        # Various network config...
@@ -99,8 +91,6 @@ if [ "${NEUTRON_PLUGIN_NAME}" = "OpenVSwitch" ] ; then
        pkgos_read_config ${OVS_CONF} OVS enable_tunneling      neutron/enable_tunneling
        pkgos_read_config ${OVS_CONF} OVS tunnel_id_ranges      neutron/tunnel_id_ranges
 
-       read_nova_admin_credentials
-
        # Guess values to put in the local_ip directive
        IF=`LC_ALL=C route | grep default |awk -- '{ print $8 }'`
        guessed_ip_addr=`LC_ALL=C ifconfig ${IF} | grep 'inet addr' | sed 's/.\+inet addr:\([0-9.]\+\).\+/\1/'`

diff --git a/trusty/debian/neutron-common.postinst.in b/trusty/debian/neutron-common.postinst.in
index 5bd927ced3afdc1fb89677e39fb6be79495b7fd7..7b813dc3bce4a8153d5a482fe29ac06482a963e9 100644 (file)
--- a/trusty/debian/neutron-common.postinst.in
+++ b/trusty/debian/neutron-common.postinst.in
@@ -57,19 +57,6 @@ neutron_core_plugin_class () {
        esac
 }
 
-write_nova_admin_credentials () {
-        db_get neutron/nova_url
-       pkgos_inifile set ${N_CONF} DEFAULT nova_url ${RET}
-       db_get neutron/nova_region
-       pkgos_inifile set ${N_CONF} DEFAULT nova_region_name ${RET}
-       db_get neutron/nova_admin_tenant_id
-       pkgos_inifile set ${N_CONF} DEFAULT nova_admin_tenant_id ${RET}
-       db_get neutron/nova_admin_username
-       pkgos_inifile set ${N_CONF} DEFAULT nova_admin_username ${RET}
-       db_get neutron/nova_admin_password
-       pkgos_inifile set ${N_CONF} DEFAULT nova_admin_password ${RET}
-}
-
 if [ "$1" = "configure" ] || [ "$1" = "reconfigure" ] ; then
        . /usr/share/debconf/confmodule
 
@@ -122,7 +109,6 @@ if [ "$1" = "configure" ] || [ "$1" = "reconfigure" ] ; then
                pkgos_inifile set ${OVS_CONF} OVS local_ip "${RET}"
        fi
 
-       write_nova_admin_credentials
        db_stop
 
        chown -R neutron:adm /var/log/neutron/

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.