1f95680a32
Note: whilst this is a large patch, most of it is just moving stuff around. This has a number of benefits now: - generate the marathon/chronos files - one file per running container (easier to manage changes) - no need to redefine lots of marathon attributes - to create special marathon attributes specify them under "service"/"task" or "container" depending on the attribute and it will override the value in services/default.marathon.j2 - render the command's files just before running the command (previously there was a risk of rendering the files too early) We can benefit from the changes with a little more work: - any update tasks can be easily separated from the service Change-Id: I007c2859b9d4bf8e9b984cbeba93456a9ce06f29
25 lines
702 B
Django/Jinja
25 lines
702 B
Django/Jinja
export OS_PROJECT_DOMAIN_ID=default
|
|
export OS_USER_DOMAIN_ID=default
|
|
|
|
if [[ -n "$1" ]]; then
|
|
OS_USERNAME=$1
|
|
fi
|
|
if [[ -n "$2" ]]; then
|
|
OS_PROJECT_NAME=$2
|
|
fi
|
|
|
|
export OS_PROJECT_NAME=${OS_PROJECT_NAME:-admin}
|
|
export OS_USERNAME=${OS_USERNAME:-admin}
|
|
|
|
if [ $OS_USERNAME == "admin" ]; then
|
|
export OS_PASSWORD={{ keystone_admin_password }}
|
|
fi
|
|
|
|
export OS_AUTH_URL=http://{{ kolla_internal_address }}:{{ keystone_admin_port }}
|
|
export OS_REGION_NAME={{ openstack_region_name }}
|
|
|
|
export NOVA_VERSION=${NOVA_VERSION:-1.1}
|
|
export COMPUTE_API_VERSION=${COMPUTE_API_VERSION:-$NOVA_VERSION}
|
|
export CINDER_VERSION=${CINDER_VERSION:-2}
|
|
export OS_VOLUME_API_VERSION=${OS_VOLUME_API_VERSION:-$CINDER_VERSION}
|