openstack/instack-undercloud
Code Issues Proposed changes

Merge "Add missing swift configuration"

Browse Source
This commit is contained in:
James Slagle 2015-03-25 16:42:08 +01:00 committed by Gerrit Code Review
commit edf1b932ef
3 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
elements/puppet-stack-config/puppet-stack-config.pp
View File

@ -198,6 +198,7 @@ class { 'neutron::agents::ml2::ovs':
# swift proxy
include ::memcached
include ::swift::proxy
include ::swift::ringbuilder
include ::swift::proxy::proxy_logging
include ::swift::proxy::healthcheck
include ::swift::proxy::cache
@ -227,6 +228,20 @@ $swift_components = ['account', 'container', 'object']
swift::storage::filter::recon { $swift_components : }
swift::storage::filter::healthcheck { $swift_components : }
$controller_host = hiera('controller_host')
@@ring_object_device { "${controller_host}:6000/1":
zone => 1,
weight => 1,
}
@@ring_container_device { "${controller_host}:6001/1":
zone => 1,
weight => 1,
}
@@ring_account_device { "${controller_host}:6002/1":
zone => 1,
weight => 1,
}
# Ceilometer
include ::ceilometer
include ::ceilometer::api

3
elements/undercloud-post-config/os-refresh-config/post-configure.d/98-undercloud-setup
View File

@ -53,7 +53,8 @@ ENDPOINT_LIST="--glance-password $UNDERCLOUD_GLANCE_PASSWORD
--nova-password $UNDERCLOUD_NOVA_PASSWORD
--tuskar-password $UNDERCLOUD_TUSKAR_PASSWORD
--ironic-password $UNDERCLOUD_IRONIC_PASSWORD
--ceilometer-password $UNDERCLOUD_CEILOMETER_PASSWORD"
--ceilometer-password $UNDERCLOUD_CEILOMETER_PASSWORD
--swift-password $UNDERCLOUD_SWIFT_PASSWORD"
REGISTER_SERVICE_OPTS=

1
scripts/instack-apply-config
View File

@ -44,6 +44,7 @@ export UNDERCLOUD_NEUTRON_PASSWORD=${UNDERCLOUD_NEUTRON_PASSWORD:-$(tripleo os-m
export UNDERCLOUD_NOVA_PASSWORD=${UNDERCLOUD_NOVA_PASSWORD:-$(tripleo os-make-password)}
export UNDERCLOUD_IRONIC_PASSWORD=${UNDERCLOUD_IRONIC_PASSWORD:-$(tripleo os-make-password)}
export UNDERCLOUD_TUSKAR_PASSWORD=${UNDERCLOUD_TUSKAR_PASSWORD:-$(tripleo os-make-password)}
export UNDERCLOUD_SWIFT_PASSWORD=${UNDERCLOUD_SWIFT_PASSWORD:-$(tripleo os-make-password)}
if [ -z "$INSTACK_ROOT" ]; then
sudo -E /usr/share/instack-undercloud/undercloud-stack-config/install.d/02-undercloud-stack-heat-metadata