openstack/octavia
Code Issues Proposed changes

Merge "Remove deprecated signing_dir config setting"

Browse Source
This commit is contained in:
Jenkins 2017-06-20 02:01:36 +00:00 committed by Gerrit Code Review
commit e5ac4a0426
3 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
devstack/plugin.sh
View File

@ -152,8 +152,6 @@ function create_octavia_accounts {
function octavia_configure { function octavia_configure {
create_octavia_cache_dir
sudo mkdir -m 755 -p $OCTAVIA_CONF_DIR sudo mkdir -m 755 -p $OCTAVIA_CONF_DIR
safe_chown $STACK_USER $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" iniset $OCTAVIA_CONF database connection "mysql+pymysql://${DATABASE_USER}:${DATABASE_PASSWORD}@${DATABASE_HOST}:3306/octavia"
# Configure keystone auth_token for all users # 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 # Ensure config is set up properly for authentication as admin
iniset $OCTAVIA_CONF service_auth auth_url $OS_AUTH_URL 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 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 # check for service enabled
if is_service_enabled $OCTAVIA; then if is_service_enabled $OCTAVIA; then
if [ $OCTAVIA_NODE == 'main' ] || [ $OCTAVIA_NODE == 'standalone' ] ; then # main-ha node stuff only if [ $OCTAVIA_NODE == 'main' ] || [ $OCTAVIA_NODE == 'standalone' ] ; then # main-ha node stuff only

1
devstack/settings
View File

@ -7,7 +7,6 @@ DISKIMAGE_BUILDER_REPO_REF=${DISKIMAGE_BUILDER_REPO_REF:-master}
DISKIMAGE_BUILDER_DIR=$DEST/diskimage-builder DISKIMAGE_BUILDER_DIR=$DEST/diskimage-builder
OCTAVIA_BIN_DIR=${OCTAVIA_BIN_DIR:-$(get_python_exec_prefix)} OCTAVIA_BIN_DIR=${OCTAVIA_BIN_DIR:-$(get_python_exec_prefix)}
OCTAVIA_CONF_DIR=${OCTAVIA_CONF_DIR:-"/etc/octavia"} 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_SSH_DIR=${OCTAVIA_SSH_DIR:-${OCTAVIA_CONF_DIR}/.ssh}
OCTAVIA_CERTS_DIR=${OCTAVIA_CERTS_DIR:-${OCTAVIA_CONF_DIR}/certs} OCTAVIA_CERTS_DIR=${OCTAVIA_CERTS_DIR:-${OCTAVIA_CONF_DIR}/certs}
OCTAVIA_DHCLIENT_DIR=${OCTAVIA_DHCLIENT_DIR:-${OCTAVIA_CONF_DIR}/dhcp} OCTAVIA_DHCLIENT_DIR=${OCTAVIA_DHCLIENT_DIR:-${OCTAVIA_CONF_DIR}/dhcp}

1
etc/octavia.conf
View File

@ -268,7 +268,6 @@
[service_auth] [service_auth]
# memcached_servers = # memcached_servers =
# signing_dir =
# cafile = /opt/stack/data/ca-bundle.pem # cafile = /opt/stack/data/ca-bundle.pem
# project_domain_name = Default # project_domain_name = Default
# project_name = admin # project_name = admin