sahara uses incorrect conf variable to set port in tls-proxy

[Rob Crittenden]

https://bugs.launchpad.net/devstack/+bug/1419163 added tls-proxy support for sahara but introduced a bug. The port is not set properly causing stack.sh to fail because it cannot connect to the internal port.

diff --git a/lib/sahara b/lib/sahara
index 6d4e864..51e431a 100644
--- a/lib/sahara
+++ b/lib/sahara
@@ -186,7 +186,7 @@ function configure_sahara {

     if is_service_enabled tls-proxy; then
         # Set the service port for a proxy to take the original
- iniset $SAHARA_CONF DEFAULT port $SAHARA_SERVICE_PORT_INT
+ iniset $SAHARA_CONF_FILE DEFAULT port $SAHARA_SERVICE_PORT_IN
T
     fi

     recreate_database sahara

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/185712

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/185712
Committed: https://git.openstack.org/cgit/openstack-dev/devstack/commit/?id=aece9ff9eff94fcdd2bdac14d64536e16207139d
Submitter: Jenkins
Branch: master

commit aece9ff9eff94fcdd2bdac14d64536e16207139d
Author: Rob Crittenden <email address hidden>
Date: Tue May 26 15:24:38 2015 -0400

    Use correct conf file variable name in sahara

    When the tls-proxy service is enabled then a separate
    set of ports is used internally vs externally. The
    services listen on the internal port and a proxy (stud)
    listen on the "standard" port and forward requests to
    the internal port.

    An incorrect environment variable was being used to set
    the internal port in the sahara configuration so it wasn't
    listening on the correct port, causing stack.sh to fail
    because it thought the service wasn't up (at least not
    on the right port).

    Change-Id: I3384039392be786d3c189f3e4f84e069ddaf4339
    Closes-Bug: #1458984