aboutsummaryrefslogtreecommitdiff
path: root/docker/keystone
AgeCommit message (Collapse)AuthorFilesLines
2016-03-21Fix bad apache2 closeSamYaple1-9/+5
Change-Id: Id19450a566da1bf7b824f0050e7c3e3f73581a9b Closes-Bug: #1557036
2016-03-11Remove openstack client from keystone bootstrapSamYaple1-58/+18
Keystone has merged the rest of thier bootstrap code. Lets take advantage of that. TrivialFix Change-Id: Icfe8a2dca7ae49724fa3290fdfe9fb21b8ba01a2
2016-03-11Install master's version of an RDO keystoneSteven Dake1-1/+3
RDO isn't moving for approxximately 1 week new packages into current-passed-ci. This blocks Sam's keystone bootstrap patch. To unblock this, we temporarily have provided copr built RPMs based upon the srpm from RDO and keystone-master tarball. TrivialFix Change-Id: Ic0fe30c56e8dd229f2a25157125272324621bad9
2016-03-04Retry token retrival in keystone bootstrap scriptSamYaple1-2/+8
TrivialFix Change-Id: I83da0298067d5f37603c52fb312828ea1fbbb00c
2016-03-03Merge "When ansible fails it still reads chaged key"Jenkins1-1/+1
2016-03-03When ansible fails it still reads chaged keySamYaple1-1/+1
Add changed key failure as well. Closes-Bug: #1552405 Change-Id: Ic25a57ba20928bee136932cc422713e76dcbe2a1
2016-03-03Fix Keystone v3 and HorizonSamYaple1-1/+1
After our switch to keystone-manage bootstrap Horizon is not happy due to v3 not being setup correctly. This patch fixes that This also includes removal of unused variables (transforms them into endpoint url variables) TrivialFix Change-Id: I1e04db8c24049f80e974c063f03068a2ab32a563
2016-03-01Remove keystone admin tokenSamYaple2-6/+84
Admin token has been deprecated upstream. It will be removed in O. We switch over to the new `keystone-manage bootstrap` method for creating the initial admin user, role, and project. Co-Authored-By: Sam Yaple <sam@yaple.net> Change-Id: I6ca90e8d4c3b71009e24b049b2efbc08c05ebfbf
2016-02-28No need the keystone-dist-paste.ini fileJeffrey Zhang1-1/+0
This file is in the expected path when using CentOS binary install TrivialFix Change-Id: Ic64d2bed4791250065464b6bdb6cc0992c858aaf
2016-02-19Make Heka collect Keystone logsÉric Lemoine2-1/+26
Partially implements: blueprint heka Change-Id: I940143876981a04464af67aff65c09a06926701d
2016-02-14Fix keystone initial auth mechanismSamYaple1-0/+5
A recent change in keystone [1] has deprecated the token auth mechanism that we used. We reintroduce it temporarily while a more permanant solution is worked on. [1] https://github.com/openstack/keystone/commit/5286b4a297b5a94895a311a9e564aa87cb54dbfd Change-Id: I4d585733a9abd201c1b0680e6196dd2a36db3c7e Closes-Bug: #1545292
2016-02-14Install keystone-dist-paste.ini in /etc/keystoneSteven Dake1-0/+1
The CentOS packages install a default version of the paste file but don't install them in the /etc directory. Kolla doesn't configure the paste files, so this file never gets setup properly. With the recent change in Keystone around the default admin_token being changed, this triggered Keystone to return a 401 Auth error. A follow-on patch from Sam edits this file, and that patch breaks the build without this dependent patch. TrivialFix Change-Id: Ib1568e186bdd7d19b7e5af151388197755902488
2015-12-30Merge "Keystone ubuntu binary container"Jenkins1-0/+13
2015-12-30Keystone ubuntu binary containerArtur Zarzycki1-0/+13
Change-Id: Ibacbc5e2d3988c646998f6e69e2ea34c69e039f8 Partially-Implements: blueprint binary-ubuntu
2015-12-27Fix pip install settingsSamYaple1-1/+1
There were some inconsistencies with pip install instructions thoughout Kolla. We fix those here. Additionally, we fix the virtualenv to properly use the site-packages on the host if a library is not available in the venv. Change-Id: Ib84d48e8826bb96060338b3fa0782620c98794a8 Related-Bug: #1524684 Closes-Bug: #1529434
2015-12-15Move the admin account creation to register.ymlJeffrey Zhang1-14/+0
Create the admin project, user, role and keystone service info by using ansible task rather than shell script Closes-Bug: #1526251 Change-Id: Ieee215b9de1618b3d31f3d1a766a9d0ebafdee4d
2015-11-27Source installation in virtualenvMichal Rostecki1-1/+1
Use virtualenv for installation of OpenStack projects and dependencies to avoid conflicts with Python libraries installed by non-OpenStack binary packages. Change-Id: I21ecd673b2e93335b1d3dd4e279e940c9d694c3c Implements: blueprint virtualenv
2015-11-23Remove hardcoded MAINTAINER in DockerfilesSwapnil Kulkarni (coolsvap)1-1/+1
Added new option in kolla-build.conf Change-Id: I45fe51966bcb59ea19d112281ba3d5a1ba091a56 Closes-Bug:#1514304
2015-11-05Clean up keystone httpd pid files for RPM distrosPaul Bourke1-0/+7
In some cases we're seeing httpd not cleaning up properly after itself, which results in the keystone container failing to restart. This is confirmed to happen on rpm based distros, but have not had any reports on Ubuntu. Change-Id: I58b006189e700f1c851601b4f64dd0fae931103c Closes-Bug: #1489676 Co-Authored-By: Tim Potter <tpot@hpe.com>
2015-10-15Use openstack/requirements for keystonePaul Bourke1-1/+1
See Iccb4e99f8e4b6659a19c1817d0f4c697824af25c for context. Change-Id: Ic4f5732e70b0cda3b3755e8fe33ece3116fa8afc Partial-Bug: #150530
2015-10-13Fix issue with su and bad kernelsSam Yaple1-1/+1
Long story short, some kernels before 3.15 had an issue with using su in a container when the network namespace was --net=host. The gate has a 3.10 and a 3.13 kernel and has a problem with this. This changes everything to use sudo backport: liberty Partially-Implements: blueprint functional-testing-gate Change-Id: I4d79ccaa1cddffcc8393f64e7e1be2538efe33e5
2015-10-06Common start.shSam Yaple2-9/+2
The majority of the start.sh code is identical. This removes that duplicate code while still maintaining the ability to call code in a specific container. The start.sh is moved into /usr/local/bin/kolla_start in the container The extend_start.sh script is called by the kolla_start script at the location /usr/local/bin/kolla_extend_start . It always exists because we create a noop kolla_extend_start in the base directory. We override it with extend_start.sh in a specific image should we need to. Of note, the neutron-agents container is exempt from this new structure due to it being a fat container. Additionally, we fix the inconsistent permissions throughout. 644 for repo files and the scripts are set to 755 via a Docker RUN command to ensure someones local perm change won't break upstream containers. Change-Id: I7da8d19965463ad30ee522a71183e3f092e0d6ad Closes-Bug: #1501295
2015-09-28Merge "Implement a install_type and install_metatype"Jenkins1-1/+1
2015-09-28Merge "remove set_configs"Jenkins1-5/+0
2015-09-28Implement a install_type and install_metatypeSteven Dake1-1/+1
This prepares for the RHEL OSP implementation by making the build tool convert all binary-* into an install_type of binary and * into an install_metatype variable substitution inside the Dockerfiles. Further binary-* is substituted as install_name to enable proper building only. Change-Id: Ib681b29176eb79a3cab12ec824313fdecb6e7a5f Partially-Implements: blueprint rhel-based-image-support
2015-09-27remove set_configsSam Yaple1-5/+0
Change-Id: I9bb0a1fac63cc326234b0f06b1e56b43e0753279 Partially-Implements: blueprint replace-config-external
2015-09-27Remove all fail sections for UbuntuSam Yaple1-14/+0
Ubuntu binary is not supported and may never be. Installing from cloud-archive packaging is only for the current stable distros, Ubuntu does not have a Delorean type repo. We place a fail message in the base image to catch this and remove the messages throughout the project. An additional fail message is placed to catch all other things. Change-Id: Id2953f503ebd42226f6a08e75979ae56511c40f7 Implements: blueprint install-from-ubuntu
2015-09-25Fix removal of config-externalSam Yaple1-1/+0
I removed the files but not the COPY commands thus breaking all of Kolla Change-Id: I37d3e0cb94a1ecc12971f485f953310ba8fee53c Partially-Implements: blueprint replace-config-external
2015-09-25Remove config-external.shSam Yaple1-25/+0
Removes config-external for all services that have been replaced in Ansible Change-Id: I839a14418638b977fbc1d02ba6839811b0f909ea Partially-Implements: blueprint replace-config-external
2015-09-18Replace config-external with a JSON file for Keystonerthallisey1-9/+5
Change-Id: I4c403edb7cd16f587f30a313c1943f070512eda3 Partially-Implements: blueprint replace-config-external
2015-09-04Add 'rhel' for RPM distrosSteven Dake1-2/+2
Add 'rhel' to list for RPM based distros. Also sort the distro list for rpm packages for affected lines. Change-Id: Ied4cb3e9763d6c6359f314d16185383ac3e006ed Partially-Implements: blueprint rhel-based-image-support
2015-09-04Merge "Allow arbitrary source archive name to be imported into Dockerfile"Jenkins1-2/+2
2015-09-03Allow arbitrary source archive name to be imported into DockerfileVladislav Belogrudov1-2/+2
Currently we cannot import source archives with names different than expected by hardcoded line in Dockerfiles. This worked well for Openstack services' tarballs where we expected SERVICE-* root folder after extraction or kanaka-noVNC for nova-novncproxy docker. The latter fails if one tries to clone or get tarball under other names. This fix allows any archive (tar,tgz,zip) or repo name to be imported into dockerfile. Change-Id: I869a6a19afaf0e93925572746c22b7589b6600c9 Closes-Bug: #1491415
2015-09-03Create openstack-base containerSam Yaple1-1/+1
This creates and moves the dependencies for Ubuntu into a common openstack-base container. This commit shows dramatically smaller sizes for all non-openstack containers. The Openstack container remain the same size. Change-Id: I2f46420d4b9edcfddda374caddcce906fc708f6c Partially-Implements: blueprint openstack-common-container
2015-08-30Keystone container should use the openstackclientSam Yaple1-10/+7
Initially it did not use this client due to the fact that the client didn't seem to want to work in the containers. Now it works fine and it should be used instead of the deprecated keystone client Change-Id: Ib0e172c677e200e5df01c478b7ea257b30c0df0b Closes-Bug: #1490126
2015-08-29Add Ansible support for HeatSteven Dake1-1/+0
This changes bootstrapping of the Heat container to bootstrap the Heat container with a heat domain user. This requires some work from bootstrap.yml to pass in several environment variables needed by the heat domain setup script. Co-Authored-By: Sam Yaple <sam@yaple.net> Change-Id: Iab05983754fa514835cb5ff54d775faa18773110 Partially-implements: blueprint ansible-heat
2015-08-28Keystone container listens on port 80 by defaultSteven Dake1-2/+4
A default configuration file is present in RPM distros which listen to http on port 80 by default. With this patch the keystone container works on centos+binary where it did not previously. Closes-Bug: 1490025 Change-Id: I4b5260200521e79d76eec324eb0ef026aa61b23d
2015-08-28Move docker_templates to docker dirSam Yaple3-0/+144
Updated build.py to reflect this change. Deprecate --template option and make it a noop. Change-Id: I7cd98d1ee684a4c64984a49597159868152683b2 Partially-Implements: blueprint remove-docker-dir
2015-05-15Restructure builds to allow more flexibilitySam Yaple4-189/+0
As a restructure, nothing is changed from the original behaviour and naming despite the file structure changing. The symlinks to build had to be updated generating lots of "deleted" and "new_file". The new structure is: docker/${base_distro}/${type}/${container} base_distro == centos, ubuntu, fedora, etc type == source, binary, rdo type rdo is a symlink to binary for backwards compatibility Two new flags are added to the build-all script to support the ability to support different base distros and a flag to support binary or source containers. There are several added folders that are empty to hold the directory structure for future containers of these types. To use a prefix other than centos-rdo- you can set PREFIX in the toplevel directory .buildconf file Change-Id: Ifc7bac0d827470f506c8b5c004a833da9ce13b90
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