summaryrefslogtreecommitdiff
path: root/docker/keystone
AgeCommit message (Collapse)AuthorFilesLines
2015-05-06Port to icehouseSteven Dake1-1/+1
This represents making build-docker-images --release build with the icehouse tag and causes docker-compsoe to pull from the icehouse tag. Partially-implements: blueprint port-kilo Change-Id: I66b2c39abc55c0f47152dd90e696fc46b9c58f50
2015-04-27Change the default shell to bashChen Zhiwei2-2/+2
Unify the shell to bash in all Kolla scripts. Change-Id: Ib9591b2f8f344eb88455c5e9b7ecf2164fb5960a Implements: blueprint use-bash-shell
2015-04-01Allow check_for_* functions to be consumed by wait_forMartin André1-1/+1
In order for the `check_for_*` functions to be consumed by `wait_for`, they should notify of their success but not exit. As a consequence, the previous behavior is restored by the fail_unless_* companion functions. With this change, it is now possible to do: wait_for 30 1 check_for_os_service_running keystone Change-Id: I16ddf8913027030c3ccb5487713d172904508fd6
2015-03-27Replace ; with && in DockerfileSam Yaple1-1/+1
When using ';' this can allow the previous command to fail and while the docker build proceeds without realizing a command failed. Switching to '&&' allows the exit code to make it to the docker build command and the build to fail appropriately. Change-Id: Idd0991ed4549542bb10d27da1a0a025d0503b6c1
2015-03-21Merge "Don't kill keystone, but instead wait for it to finish at the end"Jenkins1-14/+2
2015-03-20Don't kill keystone, but instead wait for it to finish at the endSteven Dake1-14/+2
use the bash wait builtin to wait for the keystone process to exit. Change-Id: I03057e7925e7e41120c163c0be22ade75050d9f1
2015-03-20Fixes Keystone openrc and sets / for scriptsDaneyon Hansen2-5/+5
Previously, the keydtone openrc file was not using the proper auth url, whcih was broken with too many double ticks. Also changed the auth port from public to admin since keystone user is an admin tenant. Changed DIR for scripts to align with the rest of the project. Change-Id: Iadde3239227e65ecca479b16a7b7db51d3a579c8
2015-03-18Add a "admin" user via crux to keystone containerSteven Dake1-1/+6
The keystone container was changed to only add a keystone user. The rest of the infrastructure in Kolla expects the name "admin" from a "can I use a client to access the APIs perspective." As a result, we need a user for keystone and a user for admin which this patch adds. Change-Id: I3a3e938f946df1fd5982e89397ef61368f1f3674
2015-03-13Implements: blueprint container-set-api-controlDaneyon Hansen2-34/+124
Adds Keystone Container-Set support Previously, Keystone containers were configured for use in a Kubernetes environment. This patch removed k8s dependencies and adds container set functionality. Change-Id: I131ce205857110bbee49fe81a4a005f9e273ce09
2015-03-02Allow changing base imageMartin André1-1/+1
By changing the PREFIX variable in the .buildconf one is now able to build docker images from different bases. For example, add the following line to your .buildconf file to build CentOS based images: PREFIX=centos-rdo- Default base image is Fedora. For now only RH family is supported. Additionally, changing the namespace either with the NAMESPACE variable in .buildconf or via --namespace commandline option now changes the source namespace as well from the default kollaglue one. Implements: blueprint multi-baseos Co-Authored-By: Steven Dake <stdake@cisco.com> Change-Id: I3964cd2292789ea883a1f2d2738a5731a4fff49b
2015-02-24Make keystone work with CentOS 7 imageSteven Dake1-3/+0
Keystone relies on crux. Crux is now installed in the base images, so individual images don't need to install crux. Partially-implements: blueprint multi-baseos Change-Id: Id9ed5fb8bc74de6a36f28a6b2bc8ba055c31a32e
2015-01-19Cleanup required variables checks for all containersMartin André1-1/+2
This allows Kubernetes to reschedule containers in case a required variable is missing, for example when the Kubernetes pod is started before the service. The checks were cleaned using the following method: * remove duplicates * remove check for variables that get a default value in the same file * check for all variables used in the file * check for required services when it is obvious. Change-Id: Ib7e0530c410c61f828d36efe8925a20dc9781eab
2014-12-26Merge "Prefer the use PUBLIC_IP over MY_IP"Jenkins1-1/+1
2014-12-17Enable usage of containers outside of KubernetesMartin André1-2/+0
Kubernetes currently creates FOO_SERVICE_HOST and FOO_SERVICE_PORT env vars as part of starting the containers. However this is not done when starting them with plain docker. Defaulting variables to their common version if they're not already set allows the usage of --link in plain 'docker run' to wire together containers. Co-Authored-By: Charles Crouch <ccrouch@redhat.com> Change-Id: I91098ff987b18646d901ac63a3a644fbb68fc857
2014-12-03Prefer the use PUBLIC_IP over MY_IPMartin André1-1/+1
PUBLIC_IP is more descriptive that MY_IP, it should be used consistently across Kolla. Change-Id: Iff6ae903e794ec84a40a300b36512422b7a81f71
2014-12-03Check for all required variables in keystone start.shMartin André1-1/+4
This allows Kubernetes to reschedule the container in case a required variable is missing, for example when the Kubernetes pod is started before the service. Additionally, define the KEYSTONE_ADMIN_SERVICE_HOST and KEYSTONE_PUBLIC_SERVICE_HOST variables to their common version if not already set to allow usage outside of Kubernetes with docker link feature. Change-Id: Ie0966c18076a770e4031bbf5f777dd1be0ba20bc Closes-Bug: 1398632
2014-10-22Update MAINTAINER in Dockerfiles to Kolla ProjectLars Kellogg-Stedman1-1/+1
Remove individual MAINTAINER information from Dockerfiles. Change-Id: I777df5cde049599dc786176e1d5b4b9597f0b334
2014-10-13log to stdout/stderrLars Kellogg-Stedman1-2/+3
modify glance and keystone images to log to stdout/stderr, so that logs can be recovered using "docker logs". Change-Id: I18470c13142ceaf2f10c32e10f5e835ddaf58550
2014-10-13added simple health check scriptsLars Kellogg-Stedman3-0/+20
add /check.sh to keystone and glance-api images that can be used to verify proper functionality of the container. Change-Id: I0a878678fb8e9427d8e99af4896cbc679d3490a4
2014-10-13keystone: exit on errors; cleanupLars Kellogg-Stedman1-29/+18
Cause keystone start script to exit on any errors (permitting kubernetes to reschedule the pod). Closes-bug: 1379057 Change-Id: Ide2eac6495250c8cba91cf9b7409dcb313f6f74b
2014-10-13properly quote password in keystone start scriptLars Kellogg-Stedman1-1/+1
make sure that DB_ROOT_PASSWORD is in quotes to prevent errors from shell metacharacters in the password. Change-Id: I586ba7bb1d518d4ebfef257f92d315684843dd9b
2014-10-08update existing keystone objectsLars Kellogg-Stedman1-2/+5
when booting the keystone container with an existing database, make sure to update credentials for admin user and replace existing keystone endpoint in the service catalog. Change-Id: I2c66d75210ef7ba5a96077eea15a8c564e99f662
2014-10-07Reorganize k8s structureSteven Dake3-44/+0
All services go to TLD/k8s/service All pods go to TLD/k8s/pod Change-Id: Iad2977a9f0cd5f430c4e0a566846bf4681618379
2014-10-07renamed keystone servicesLars Kellogg-Stedman4-11/+11
This renames the keystone services so that they are named by function, rather than port number (which would be confusing if they were running on a different port). Change-Id: Ibb0263a133c28a104563df431870a9effe584012
2014-10-07use renamed mariadb servicesLars Kellogg-Stedman1-3/+3
This patch updates all the json files that reference the mariadb service variables to ues the new names. Labelling things foo-master crept into this repository from the kubernetes guestbook example (which has redis-master and redis-slaves). We're not running clustered software at the moment so these labels are unnecessary. Change-Id: I229d04c89aa13cb6cc2e1c33a0a7b21e1c6e9caa
2014-10-06use "crux" for creating users/endpointsLars Kellogg-Stedman2-41/+37
this patch introduces the "crux" [1] tool for creating keystone users, services, and endpoints in an idempotent fashion. E.g., to create a user that doesn't exist: $ crux user-create -n lars -t lars -p secret creating new tenant created tenant lars (d74cec5023c4428da533066bb11943db) creating new user lars created user lars (adf2c2d92e894a3d90a403c5885f192e) And performing the same operation a second time: $ crux user-create -n lars -t lars -p secret using existing tenant lars (d74cec5023c4428da533066bb11943db) using existing user lars (adf2c2d92e894a3d90a403c5885f192e) The behavior is similar for creating keystone endpoints. [1]: https://github.com/larsks/crux Change-Id: I694e0c1bdcdde595e1af2ee8ef5d0f239a9ad4cd
2014-10-04introduce a new build mechanismLars Kellogg-Stedman2-4/+1
This patch replaces the collection of individual "build" scripts with a single script (tools/build-docker-image), made available as "build" inside each image directory. The build-docker-image script will, by default, build images tagged with the current commit id in order to prevent developers from accidentally stepping on each other or on release images. Documentation in docs/image-building.md describes the script in more detail. Change-Id: I444d5c2256a85223f8750a0904cb4b07f18ab67f
2014-10-03Merge "Keystone: Do a service and endpoint create"Jenkins1-6/+25
2014-10-03Merge "Keystone: remove extra commas and tabs in JSON"Jenkins1-8/+6
2014-10-03Keystone: remove extra commas and tabs in JSONSteven Dake1-8/+6
The JSON doesn't parse correctly Change-Id: Ie68ad1cdfb80b9f3c15e9d93476f7c53cc0a0858
2014-10-03Keystone: Do a service and endpoint createSteven Dake1-6/+25
This patch does a service and endpoint create so that each separate service can find keystone. This patch also makes the sleeping a bit more logical although there are TODOs in this area to remove the sleep operations. Change-Id: Icfee464f9473686da89bfa8b2106172cbfd4c1a8 Closes-Bug: #1376975
2014-10-02fix keystone dockerfileLars Kellogg-Stedman1-2/+4
- fully qualify base image (fedora-rdo-base -> kollaglue/fedora-rdo-base) - EXPOSE keystone service ports Change-Id: I3b848dc1743d577ea84be868b04a41383115592b
2014-10-02Restart container until mariadb is availableSteven Dake1-0/+5
Fix a race condition between MariaDB service start and Keystone. Change-Id: I31384204eca9c7201eb102ec0359b390e88b96ba
2014-10-02Change "redhat" to "kolla" in the keystone authenticationSteven Dake1-1/+1
Change-Id: Ic5fe761906e0ea6964c072ae510f7e62706c286b
2014-09-27Use pki_setup to set up keystone properlySteven Dake1-1/+3
2014-09-27Setup pki_setup on initial setup of keystoneSteven Dake2-2/+3
Need PKI setup for keystone to operate.
2014-09-27Point to fedora-rdo-* for image namesSteven Dake1-1/+1
2014-09-27Pull mariadb and keystone images from the kollaglue organizationSteven Dake1-1/+1
Presently these are pulled from a closed location inside a firewall. Instead pull them from the public docker registry.
2014-09-27Make keystone use stderrSteven Dake1-0/+2
We want all log output to go to stderr so it can be debugged later.
2014-09-25Add a push script for each of the separate daemonsSteven Dake1-0/+2
This pushes to the docker registry.
2014-09-25Make build tools build with kollaglue loginSteven Dake1-1/+1
Build with kollaglue login. Then we can upload all images under that user namespace.
2014-09-20Provide script to build docker imagesSteven Dake1-0/+2
Build all docker images one at a time or with one top level call
2014-09-20removed openstack-selinux, which is probably unnecessary inside a containerLars Kellogg-Stedman1-1/+0
2014-09-20Base images from Fedora 20 + RDO IcehouseSteven Dake1-1/+1
Previously images were based from RHEL OSP + RDO Icehouse. This presents a problem in that internal urls are used to access the rhel7 repositories. For new contributors, we need something that can be accessed without special rhel7 permissions. mariadb and rabbitmq can from fedora cinder, glance, keystone can from fedora-rdo-base This patch also uses the RDO repositories from upstream. This patch also udpates the base fedora image with latest bits.
2014-09-18parameterize ADMIN_TENANT_NAMELars Kellogg-Stedman1-3/+9
2014-09-18generate database passwod if one is not providedLars Kellogg-Stedman1-1/+4
2014-09-18removed '-e' from bash command lineLars Kellogg-Stedman1-1/+1
the keystone commands will fail if the keystone principals already exist
2014-09-18json does not like single quotesLars Kellogg-Stedman1-4/+4
2014-09-18fixed typo in var nameLars Kellogg-Stedman1-1/+1
2014-09-18fixed openssl invocationLars Kellogg-Stedman1-1/+1
generated by cgit v1.2.3 (git 2.39.1) at 2026-11-05 20:22:14 +0000