aboutsummaryrefslogtreecommitdiff
path: root/docker/horizon
AgeCommit message (Collapse)AuthorFilesLines
2016-02-13Fix horizon startup failurexionglingfeng1-1/+1
original extend_start.sh try to write temp files to a non-existent folder (/home/horizon) and cause horizon failed to start. It is fixed by moving the file to /tmp. Partial-Bug: 1543429 Change-Id: I8d8778be755a4db9e57d6ff7aaee623547c4243e
2016-01-27Re-generate the compressed css and js on every horizon startJeffrey Zhang2-4/+14
The local_settings file affect django-compress behavior, so re-generate the compressed javascript and css if it is changed Closes-Bug: #1537815 Change-Id: I330bfb666e39ffb88a4488793562df697d5572d0
2016-01-11Horizon ubuntu binary containerArtur Zarzycki1-0/+22
Change-Id: Ie11456e2b1e9bf641f7739044e8ae13d78405427 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-11Fix owner of horizon docrootProskurin Kirill1-2/+2
Horizon starts WSGI deamon from user "horizon", its docroot has "root" user. Change-Id: Iac424a88a747772a37b2ff2ae94f302a988f7201 Closes-Bug: 1525296
2015-11-27Source installation in virtualenvMichal Rostecki1-6/+6
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-13Revert "Drop root for Horizon service"Sam Yaple1-19/+1
This reverts commit f9ccb1c8829cef551b875c7c387530e7980414a7. There are many issues with this patch that prevents it from working under numerous circumstances. The implementation is entirely busted on Ubuntu. Additionally, best practice for apache is to run as root. Apache itself does the privlege dropping. Change-Id: I4395debb7d32223fb3752a6d3e7c4d7672d29916
2015-11-12Move USER operation after footerSam Yaple1-2/+2
The USER operation affects all docker commands after it. This causes a problem with our {{ include_footer }} implementation since commands in that footer may require elevated permissions to perform. In the current implementation I can no longer remove my proxy settings once the USER has been changed. Change-Id: I9b2bab5a15f595f6d52a46c64ddf59ba5608b938 Partially-Implements: blueprint drop-root
2015-11-11Drop root for Horizon serviceSteven Dake1-1/+19
Drop root privileges for Horizon service. It is necesssary to set a capability on the filesystem to allow binding to port 80 as a non-root user. I have tested this works correctly from a registry on both CentOS and Ubuntu. Change-Id: I4c26f28bb28b6633784e6842f3423a2425332c27 Partially-Implements: blueprint drop-root
2015-11-11Merge "Install keystoneauthv1 in openstack-base image"Jenkins1-1/+0
2015-11-11Install keystoneauthv1 in openstack-base imageSteven Dake1-1/+0
Lots of tools rqeuire keystoneeauthv1 not just horizon TrivialFix Change-Id: I35eb958e35500b04657679371019f2e6f3c2f2dd
2015-11-11Clean up horizon httpd pid files for RPM distrosPaul Bourke1-0/+7
(apply same fix that we did for keystone, to horizon) In some cases we're seeing httpd not cleaning up properly after itself, which results in the horizon container failing to restart. This is confirmed to happen on rpm based distros, but have not had any reports on Ubuntu. Change-Id: I8ece6da1a8a1180730d68be0d129a656ddcede07 Closes-Bug: #1515214 backport: liberty
2015-11-10Horizon rdo package requires python-keystoneauth1Martin André1-0/+1
Change-Id: I0d98399d7d573ea43689746dda59a647c307b25f Closes-Bug: #1514697
2015-11-09Fix validate-all-maintainer.sh to look for Dockerfile.j2Angus Salkeld1-1/+1
And fix the fallout. Change-Id: Iccad3f4fdb0a6a7c14246df3408cae0425b833a5
2015-10-15Use openstack/requirements for horizonPaul Bourke1-1/+1
See Iccb4e99f8e4b6659a19c1817d0f4c697824af25c for context. Change-Id: I145908bef5d18fea35f38032725f48c18f8cb831 Partial-Bug: #150530
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-8/+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-26/+0
Removes config-external for all services that have been replaced in Ansible Change-Id: I839a14418638b977fbc1d02ba6839811b0f909ea Partially-Implements: blueprint replace-config-external
2015-09-25Replace config-external - horizonSam Yaple1-9/+4
Change-Id: I72577ee7dd2dfbd199ca91f6f33f970fe1c9c89f Partially-Implements: blueprint replace-config-external
2015-09-21Remove pip install of pyscss in HorizonSteven Dake1-1/+0
Because of the correction of the dependney repos in RDO, pyscss no longer needs to be installed via pip. Change-Id: Ide0a0181a9b1353a043956ab9849a2d261f1c243 Closes-Bug: #1497436
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-29Make Horizon work on centos+binarySteven Dake2-7/+23
Several problems exist with Horizon on centos+binary: 1. The default setup of http binds a port to port 80 on RPM based distros. 2. There is no horizon user/group added causing config-external to break badly. 3. openstack-dashboard is installed in /usr/share/openstack-dashboard/openstack_dashboard. This is incompatible with the expectations of the wsgi configuration. 4. the target for config-external is /etc/httpd/sites.d/horizon.conf. It should be /etc/httpd/conf.d/horizon.conf 5. A workaround is required for: https://bugzilla.redhat.com/show_bug.cgi?id=1220070 6. Static display requires compressing the installation via manage.py. To do this correctly pyscss needs to be upgraded because the version in RDO is broken. Co-Authored-By: Sam Yaple <sam@yaple.net> Change-Id: Iabd3044906920f5cc60b9a6b320e62d1d7c9210f Closes-Bug: #1490066
2015-08-28Move docker_templates to docker dirSam Yaple3-0/+106
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 Yaple3-53/+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-09Move Horizon to / and make it work in the first place.Harm Weites2-2/+22
Having the dasboard in /dashboard doesn't feel right, especially since there is no automatic redirect when people browse to the ip or hostname. Which would be a natural first try. Moving to / now to make the process behave in a simpler fashion. Because of a packaging error the js/css wouldn't load properly, next to that there is an issue with a supposed missing 'manage.py compress' run. This is handled through Kolla now as well (for the time being). There is another supposed bug in packaging that makes webfont.ttf return a 404. This is because of a missing alias for /static stuff, and with moving the whole thing to / this gets adressed as well. Change-Id: I64cd7c9effad6cf9ec7c6a41f34e1184640c8adc
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-06Remove EXPOSE options from DockerfilesSteven Dake1-2/+0
The EXPOSE options will create a local docker-proxy. This is unnecessary with --net=host mode. The docker-proxy adds about 20 microseconds of latency. Add documentation to the specification to indicate where to find the ports that are exposed by the services in case someone were to desire to add EXPOSE back to the Dockerfiles. Change-Id: I398e922fe096d6022a2d5985bb92498f89a5ea31
2015-04-01Allow check_for_* functions to be consumed by wait_forMartin André1-3/+3
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-20Make the Horizon dashboard work properlySteven Dake2-5/+7
The Horizon dashboard was not working properly prior to this work. Also a docker-compose file was added to start the dashboard. Change-Id: I8a438c15b967b0cec00bfe44b997f833bf745191
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-01-19Cleanup required variables checks for all containersMartin André1-2/+0
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-11-24Horizon container implementationRyan Hallisey3-0/+35
Horizon requires that Nova, Neutron(Nova Network), Glance, and Keystone are running. Therefore, the container needs to check for the availablity of each service on startup. The config file is not a .ini file, but rather a python file so it requires using sed instead of crudini. Change-Id: I5ed14514881fe9aef688ca08bcb94881ef5b25cb