Merge "Create an endpoint for nova api v3."
diff --git a/lib/keystone b/lib/keystone
index 1b6970d..e7e0544 100644
--- a/lib/keystone
+++ b/lib/keystone
@@ -132,6 +132,11 @@
iniset $KEYSTONE_CONF DEFAULT admin_token "$SERVICE_TOKEN"
iniset $KEYSTONE_CONF signing token_format "$KEYSTONE_TOKEN_FORMAT"
+
+ if [[ "$KEYSTONE_TOKEN_FORMAT" = "UUID" ]]; then
+ iniset $KEYSTONE_CONF token provider keystone.token.providers.uuid.Provider
+ fi
+
iniset $KEYSTONE_CONF sql connection `database_connection_url keystone`
iniset $KEYSTONE_CONF ec2 driver "keystone.contrib.ec2.backends.sql.Ec2"
diff --git a/lib/nova b/lib/nova
index c87656f..617fb08 100644
--- a/lib/nova
+++ b/lib/nova
@@ -435,7 +435,7 @@
iniset $NOVA_CONF DEFAULT allow_resize_to_same_host "True"
iniset $NOVA_CONF DEFAULT api_paste_config "$NOVA_API_PASTE_INI"
iniset $NOVA_CONF DEFAULT rootwrap_config "$NOVA_CONF_DIR/rootwrap.conf"
- iniset $NOVA_CONF DEFAULT compute_scheduler_driver "$SCHEDULER"
+ iniset $NOVA_CONF DEFAULT scheduler_driver "$SCHEDULER"
iniset $NOVA_CONF DEFAULT dhcpbridge_flagfile "$NOVA_CONF"
iniset $NOVA_CONF DEFAULT force_dhcp_release "True"
iniset $NOVA_CONF DEFAULT fixed_range ""
@@ -502,7 +502,6 @@
iniset $NOVA_CONF DEFAULT instance_usage_audit "True"
iniset $NOVA_CONF DEFAULT instance_usage_audit_period "hour"
iniset $NOVA_CONF DEFAULT notify_on_state_change "vm_and_task_state"
- iniset $NOVA_CONF DEFAULT notify_on_any_change "True"
iniset_multiline $NOVA_CONF DEFAULT notification_driver "nova.openstack.common.notifier.rpc_notifier" "ceilometer.compute.nova_notifier"
fi
diff --git a/lib/swift b/lib/swift
index d09a953..e53d674 100644
--- a/lib/swift
+++ b/lib/swift
@@ -133,19 +133,6 @@
sudo sed -i '/disable *= *yes/ { s/yes/no/ }' /etc/xinetd.d/rsync
fi
- if is_service_enabled swift3;then
- swift_auth_server="s3token "
- fi
-
- # By default Swift will be installed with the tempauth middleware
- # which has some default username and password if you have
- # configured keystone it will checkout the directory.
- if is_service_enabled key; then
- swift_auth_server+="authtoken keystoneauth"
- else
- swift_auth_server=tempauth
- fi
-
SWIFT_CONFIG_PROXY_SERVER=${SWIFT_CONF_DIR}/proxy-server.conf
cp ${SWIFT_DIR}/etc/proxy-server.conf-sample ${SWIFT_CONFIG_PROXY_SERVER}
@@ -164,24 +151,22 @@
iniuncomment ${SWIFT_CONFIG_PROXY_SERVER} DEFAULT bind_port
iniset ${SWIFT_CONFIG_PROXY_SERVER} DEFAULT bind_port ${SWIFT_DEFAULT_BIND_PORT:-8080}
- # By default Swift will be installed with the tempauth middleware
- # which has some default username and password if you have
- # configured keystone it will configure swift with it.
- if is_service_enabled key;then
- if is_service_enabled swift3;then
- swift_pipeline=" swift3 s3token "
- fi
- swift_pipeline+=" authtoken keystoneauth "
- else
- if is_service_enabled swift3;then
- swift_pipeline=" swift3 "
- fi
- swift_pipeline+=" tempauth "
+ # By default Swift will be installed with keystone and tempauth middleware
+ # and add the swift3 middleware if its configured for it. The token for
+ # tempauth would be prefixed with the reseller_prefix setting TEMPAUTH_ the
+ # token for keystoneauth would have the standard reseller_prefix AUTH_
+ if is_service_enabled swift3;then
+ swift_pipeline=" swift3 s3token "
fi
+ swift_pipeline+=" authtoken keystoneauth tempauth "
sed -i "/^pipeline/ { s/tempauth/${swift_pipeline} ${SWIFT_EXTRAS_MIDDLEWARE}/ ;}" ${SWIFT_CONFIG_PROXY_SERVER}
+ iniuncomment ${SWIFT_CONFIG_PROXY_SERVER} filter:tempauth account_autocreate
iniset ${SWIFT_CONFIG_PROXY_SERVER} app:proxy-server account_autocreate true
+ iniuncomment ${SWIFT_CONFIG_PROXY_SERVER} filter:tempauth reseller_prefix
+ iniset ${SWIFT_CONFIG_PROXY_SERVER} filter:tempauth reseller_prefix "TEMPAUTH"
+
# Configure Keystone
sed -i '/^# \[filter:authtoken\]/,/^# \[filter:keystoneauth\]$/ s/^#[ \t]*//' ${SWIFT_CONFIG_PROXY_SERVER}
iniset ${SWIFT_CONFIG_PROXY_SERVER} filter:authtoken auth_host $KEYSTONE_AUTH_HOST