openstack/instack-undercloud
Code Issues Proposed changes

Switch to os-cloud-config setup-endpoints

Browse Source 
We wanted to do this anyway, and it will allow us to override the
Heat ssl port since the upstream setup-endpoints currently don't
set it properly.

Change-Id: If21ee15f1962fdc2dab01a7b16ce9e940c461dc2
This commit is contained in:
Ben Nemec 2015-04-22 16:24:07 -05:00
parent 8b69adc4ea
commit 3cfa004d43
1 changed files with 39 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,25 +46,50 @@ export UNDERCLOUD_IP=$(os-apply-config --key local-ip --type netaddress)
init-keystone -o $UNDERCLOUD_IP -t $UNDERCLOUD_ADMIN_TOKEN \ init-keystone -o $UNDERCLOUD_IP -t $UNDERCLOUD_ADMIN_TOKEN \
-e admin@example.com -p $UNDERCLOUD_ADMIN_PASSWORD -u root -e admin@example.com -p $UNDERCLOUD_ADMIN_PASSWORD -u root
# Create service endpoints and optionally include Ceilometer for UI support
ENDPOINT_LIST="--glance-password $UNDERCLOUD_GLANCE_PASSWORD
--heat-password $UNDERCLOUD_HEAT_PASSWORD
--neutron-password $UNDERCLOUD_NEUTRON_PASSWORD
--nova-password $UNDERCLOUD_NOVA_PASSWORD
--tuskar-password $UNDERCLOUD_TUSKAR_PASSWORD
--ironic-password $UNDERCLOUD_IRONIC_PASSWORD
--ceilometer-password $UNDERCLOUD_CEILOMETER_PASSWORD
--swift-password $UNDERCLOUD_SWIFT_PASSWORD"
REGISTER_SERVICE_OPTS=
# Needed by ceilometer user in register-endpoint # Needed by ceilometer user in register-endpoint
if ! openstack role show ResellerAdmin; then if ! openstack role show ResellerAdmin; then
openstack role create ResellerAdmin openstack role create ResellerAdmin
fi fi
# TODO: this needs to be switched over to use os-cloud-config's setup-endpoints # Create service endpoints and optionally include Ceilometer for UI support
tripleo setup-endpoints $UNDERCLOUD_IP $ENDPOINT_LIST $REGISTER_SERVICE_OPTS ENDPOINTS_FILE=$(mktemp)
cat > $ENDPOINTS_FILE << EOF
{
"heat": {
"password": "$UNDERCLOUD_HEAT_PASSWORD"
},
"neutron": {
"password": "$UNDERCLOUD_NEUTRON_PASSWORD"
},
"glance": {
"password": "$UNDERCLOUD_GLANCE_PASSWORD"
},
"nova": {
"password": "$UNDERCLOUD_NOVA_PASSWORD"
},
"novav3": {
"password": "$UNDERCLOUD_NOVA_PASSWORD"
},
"ceilometer": {
"password": "$UNDERCLOUD_CEILOMETER_PASSWORD"
},
"swift": {
"password": "$UNDERCLOUD_SWIFT_PASSWORD"
},
"ironic": {
"password": "$UNDERCLOUD_IRONIC_PASSWORD"
},
"tuskar": {
"password": "$UNDERCLOUD_TUSKAR_PASSWORD",
"path": "/v2"
}
}
EOF
REGISTER_SERVICE_OPTS=
setup-endpoints -s $ENDPOINTS_FILE $REGISTER_SERVICE_OPTS
rm $ENDPOINTS_FILE
if ! openstack role show heat_stack_user; then if ! openstack role show heat_stack_user; then
openstack role create heat_stack_user openstack role create heat_stack_user