openstack/kolla-ansible
Code Issues Proposed changes

Remove openstack client from keystone bootstrap

Browse Source 
Keystone has merged the rest of thier bootstrap code. Lets take
advantage of that.

TrivialFix

Change-Id: Icfe8a2dca7ae49724fa3290fdfe9fb21b8ba01a2
This commit is contained in:
SamYaple 2016-03-07 20:00:53 +00:00 committed by Steven Dake
parent c5f27aa8a6
commit 215cfc0345
1 changed files with 18 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
docker/keystone/keystone_bootstrap.sh
View File

@ -14,12 +14,6 @@ INTERNAL_URL=$6
PUBLIC_URL=$7
REGION=$8
function get_token {
unset OS_TOKEN OS_URL
OS_TOKEN=$(openstack --os-identity-api-version 3 --os-username "${USERNAME}" --os-password "${PASSWORD}" --os-project-name "${PROJECT}" --os-auth-url "${ADMIN_URL}" token issue 2>&1 | awk '/ id / {print $4}')
OS_URL="${ADMIN_URL}"
}
function fail_json {
echo '{"failed": true, "msg": "'$1'", "changed": true}'
exit 1
@ -29,33 +23,8 @@ function exit_json {
echo '{"failed": false, "changed": '"${changed}"'}'
}
function create_service {
if [[ ! $(openstack --os-identity-api-version 3 --os-token "${OS_TOKEN}" --os-url "${OS_URL}" service list 2>&1 | awk '/identity/') ]]; then
openstack --os-identity-api-version 3 --os-token "${OS_TOKEN}" --os-url "${OS_URL}" service create identity --name keystone 2>&1 > /dev/null
changed="true"
fi
}
function create_endpoints {
endpoints=$(openstack --os-identity-api-version 3 --os-token "${OS_TOKEN}" --os-url "${OS_URL}" endpoint list)
if [[ $(echo "${endpoints}" | awk '$6 == "keystone" && $4 == "'"${REGION}"'" && $12 == "admin" {print $14;exit}') != "${ADMIN_URL}" ]]; then
openstack --os-identity-api-version 3 --os-token "${OS_TOKEN}" --os-url "${OS_URL}" endpoint create --region "${REGION}" keystone admin "${ADMIN_URL}" 2>&1 > /dev/null
changed="true"
fi
if [[ $(echo "${endpoints}" | awk '$6 == "keystone" && $4 == "'"${REGION}"'" && $12 == "internal" {print $14;exit}') != "${INTERNAL_URL}" ]]; then
openstack --os-identity-api-version 3 --os-token "${OS_TOKEN}" --os-url "${OS_URL}" endpoint create --region "${REGION}" keystone internal "${INTERNAL_URL}" 2>&1 > /dev/null
changed="true"
fi
if [[ $(echo "${endpoints}" | awk '$6 == "keystone" && $4 == "'"${REGION}"'" && $12 == "public" {print $14;exit}') != "${PUBLIC_URL}" ]]; then
openstack --os-identity-api-version 3 --os-token "${OS_TOKEN}" --os-url "${OS_URL}" endpoint create --region "${REGION}" keystone public "${PUBLIC_URL}" 2>&1 > /dev/null
changed="true"
fi
}
changed="false"
get_token
if [[ ! $(openstack --os-identity-api-version 3 --os-token "${OS_TOKEN}" --os-url "${OS_URL}" user list 2>&1 | awk '/'"${USERNAME}"'/') ]]; then
keystone_bootstrap=$(keystone-manage bootstrap --bootstrap-username "${USERNAME}" --bootstrap-password "${PASSWORD}" --bootstrap-project-name "${PROJECT}" --bootstrap-role-name "${ROLE}" 2>&1)
keystone_bootstrap=$(keystone-manage bootstrap --bootstrap-username "${USERNAME}" --bootstrap-password "${PASSWORD}" --bootstrap-project-name "${PROJECT}" --bootstrap-role-name "${ROLE}" --bootstrap-admin-url "${ADMIN_URL}" --bootstrap-internal-url "${INTERNAL_URL}" --bootstrap-public-url "${PUBLIC_URL}" --bootstrap-service-name "keystone" --bootstrap-region-id "${REGION}" 2>&1)
if [[ $? != 0 ]]; then
fail_json "${keystone_bootstrap}"
fi
@ -65,24 +34,15 @@ if [[ ! $(openstack --os-identity-api-version 3 --os-token "${OS_TOKEN}" --os-ur
/Project '"${PROJECT}"' already exists, skipping creation./ ||
/User '"${USERNAME}"' already exists, skipping creation./ ||
/Role '"${ROLE}"' exists, skipping creation./ ||
/User '"${USERNAME}"' already has '"${ROLE}"' on '"${PROJECT}"'./ {count++}
/User '"${USERNAME}"' already has '"${ROLE}"' on '"${PROJECT}"'./ ||
/Region '"${REGION}"' exists, skipping creation./ ||
/Skipping admin endpoint as already created/ ||
/Skipping internal endpoint as already created/ ||
/Skipping public endpoint as already created/ {count++}
END {
if (count == 5) changed="false"; else changed="true"
if (count == 9) changed="false"; else changed="true"
print changed
}'
)
fi
count=0
while [[ ! "${OS_TOKEN}" && "${count}" -lt 5 ]]; do
get_token
((count++))
sleep 1
done
if [[ ! "${OS_TOKEN}" ]]; then
fail_json "Unable to retrieve token after 5 attempts"
fi
create_service
create_endpoints
exit_json