Do not produce Cinder v1 endpoints, as this is now handled by the package itself.

This commit is contained in:
Thomas Goirand 2015-10-13 08:49:25 +02:00
parent cc0d5e5a19
commit 505a7655f4
2 changed files with 0 additions and 6 deletions

2
debian/changelog vendored
View File

@ -5,8 +5,6 @@ openstack-meta-packages (0.14) experimental; urgency=medium
* Switched to using liberty instead of Kilo.
* Also setting OS_PROJECT_NAME in openrc.sh.
* Fixed --is-public=True -> --visibility public when adding a new image.
* Manualy create the cinder v1 service and endpoint (the Cinder package
currently only creates the cinderv2 service.
* Using openstackclient instead of keystoneclient cli when creating the
testme user and project.
* Defines the alt user and tenant correctly.

View File

@ -287,10 +287,6 @@ install_cinder () {
else
DEBIAN_FRONTEND=noninteractive ${APTGET} install tgt || true
fi
# In production, we don't need the v1 endpoint, but for tempest, we do...
openstack service create --description "Cinder Volume Service" --name cinder volume
openstack endpoint create --publicurl http://${DEFROUTE_IP}:8776/v1/%\(tenant_id\)s --adminurl http://${DEFROUTE_IP}:8776/v1/%\(tenant_id\)s --internalurl http://${DEFROUTE_IP}:8776/v1/%\(tenant_id\)s --region regionOne cinder
# Set configuration for swift-backup (normally not needed...)
#pkgos_inifile set /etc/cinder/cinder.conf backup_swift_tenant admin
#pkgos_inifile set /etc/cinder/cinder.conf backup_swift_user admin