From be27e4f0e8a15cddfd56fcb9cbb0a2902dcf01c6 Mon Sep 17 00:00:00 2001
From: Michael Johnson <johnsomor@gmail.com>
Date: Mon, 12 Jun 2017 17:03:08 -0700
Subject: [PATCH] Remove deprecated signing_dir config setting

keystonemiddleware has deprecated the "signing_dir" configuration
option [1].
This patch also removes reference to it from octavia.

[1] https://review.openstack.org/#/c/391405

Change-Id: Idda46ab1459584eafd58097ec42b9f0fcea41759
---
 devstack/plugin.sh | 11 +----------
 devstack/settings  |  1 -
 etc/octavia.conf   |  1 -
 3 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index ff61978599..1222cc3f4b 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -152,8 +152,6 @@ function create_octavia_accounts {
 
 function octavia_configure {
 
-    create_octavia_cache_dir
-
     sudo mkdir -m 755 -p $OCTAVIA_CONF_DIR
     safe_chown $STACK_USER $OCTAVIA_CONF_DIR
 
@@ -167,7 +165,7 @@ function octavia_configure {
     iniset $OCTAVIA_CONF database connection "mysql+pymysql://${DATABASE_USER}:${DATABASE_PASSWORD}@${DATABASE_HOST}:3306/octavia"
 
     # Configure keystone auth_token for all users
-    configure_auth_token_middleware $OCTAVIA_CONF octavia $OCTAVIA_AUTH_CACHE_DIR
+    configure_auth_token_middleware $OCTAVIA_CONF octavia
 
     # Ensure config is set up properly for authentication as admin
     iniset $OCTAVIA_CONF service_auth auth_url $OS_AUTH_URL
@@ -518,13 +516,6 @@ function octavia_cleanup {
     sudo rm -rf $NOVA_STATE_PATH $NOVA_AUTH_CACHE_DIR
 }
 
-# create_octavia_cache_dir() - Part of the configure_octavia() process
-function create_octavia_cache_dir {
-    # Create cache dir
-    sudo install -d -o $APACHE_USER $OCTAVIA_AUTH_CACHE_DIR
-    rm -f $OCTAVIA_AUTH_CACHE_DIR/*
-}
-
 # check for service enabled
 if is_service_enabled $OCTAVIA; then
     if [ $OCTAVIA_NODE == 'main' ] || [ $OCTAVIA_NODE == 'standalone' ] ; then # main-ha node stuff only
diff --git a/devstack/settings b/devstack/settings
index b080a1492e..06d0a002ef 100644
--- a/devstack/settings
+++ b/devstack/settings
@@ -7,7 +7,6 @@ DISKIMAGE_BUILDER_REPO_REF=${DISKIMAGE_BUILDER_REPO_REF:-master}
 DISKIMAGE_BUILDER_DIR=$DEST/diskimage-builder
 OCTAVIA_BIN_DIR=${OCTAVIA_BIN_DIR:-$(get_python_exec_prefix)}
 OCTAVIA_CONF_DIR=${OCTAVIA_CONF_DIR:-"/etc/octavia"}
-OCTAVIA_AUTH_CACHE_DIR=${OCTAVIA_AUTH_CACHE_DIR:-"/var/cache/octavia"}
 OCTAVIA_SSH_DIR=${OCTAVIA_SSH_DIR:-${OCTAVIA_CONF_DIR}/.ssh}
 OCTAVIA_CERTS_DIR=${OCTAVIA_CERTS_DIR:-${OCTAVIA_CONF_DIR}/certs}
 OCTAVIA_DHCLIENT_DIR=${OCTAVIA_DHCLIENT_DIR:-${OCTAVIA_CONF_DIR}/dhcp}
diff --git a/etc/octavia.conf b/etc/octavia.conf
index f2daf1801a..5d7dfcb582 100644
--- a/etc/octavia.conf
+++ b/etc/octavia.conf
@@ -261,7 +261,6 @@
 
 [service_auth]
 # memcached_servers =
-# signing_dir =
 # cafile = /opt/stack/data/ca-bundle.pem
 # project_domain_name = Default
 # project_name = admin