summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2015-05-27Merge "Clean up the image functional test"Jenkins7-19/+59
2015-05-27Merge "Remove unnecessary dependencies"Jenkins1-4/+1
2015-05-26Remove unnecessary dependenciesJeff Peeler1-4/+1
Glance RPM has been confirmed to depend on python-oslo-log and python-oslo-policy, so remove explicit package installs. Change-Id: Ia390b4ff1b57a079032e1f3fb2403b9fb78f038f
2015-05-26Clean up the image functional testJeff Peeler7-19/+59
1. Move setup_docker.sh to tools directory 2. Make a setup_gate.sh that installs necessary packages including docker and starts docker. 3. Add logging output. 4. Add default test timeout of 2 hours. 5. Add user to the docker group before running test cases. 6. Run image build as dockerroot group. This patch has to be one commit to fix the gate in one go. Co-Authored-By: Steven Dake <stdake@cisco.com> Change-Id: I83f3cdb1dabf0dfface589c581cb22c155467acc
2015-05-26Force developers not to run build-docker-image as rootSteven Dake1-0/+5
Instead recommend developer run build within the docker group. This script is non-functional as the root user. Change-Id: Ib70ab55e5e9bc2e7b8639d5d5ffc32a2b8795058
2015-05-26Use latest delorean repo locationSteven Dake1-1/+5
The latest delorean repo location is needed instead of the "rc2" location used previously. Also document what the repos do in the dockerfile. Change-Id: Ic9033d08784d67a2629b2f5c60fb9a4f6db53529
2015-05-26Merge "Switch Fedora base image to fedora:21"Jenkins2-2/+3
2015-05-26Always provide a tag when building with build-all-docker-imagesMartin André1-1/+16
When we're not providing a tag, the build script will use one based on the short SHA of the tip of the current git branch. Make the `build-all-docker-images` script always provide a tag to `build-docker-image` in order to prevent issues with Docker not being able to find the base image when changing branches during an ongoing build. Closes-Bug: #1458739 Change-Id: Id6925b792f46d14b20a7dbebfaf0d351ddec6538
2015-05-26Switch Fedora base image to fedora:21Martin André2-2/+3
Install required iproute package on fedora 21 for 'ip' command to work. Change-Id: Id98035dbe1eb5c0c76321784956ec15ac5d69068
2015-05-25Merge "fix subnet-create call for demo-net"Jenkins1-1/+1
2015-05-24Merge "Restructure builds to allow more flexibility"Jenkins224-49/+62
2015-05-18Updates Heat template to Support MagnumDaneyon Hansen1-1/+10
Previously, the Heat module did not support Magnum. Installing from source until pkgs are available. Change-Id: Ia83af5b811e5a113be91205671809960b24e8eff
2015-05-18Merge "Set release tag to 'latest' for development branch"Jenkins15-33/+33
2015-05-18fix subnet-create call for demo-netJustin Riley1-1/+1
(neutron client version: 2.5.0) The option is --dns-nameservers not --dns_namservers and the subnet-create subcommand expects the NETWORK and CIDR to be adjacent args. Change-Id: I4f776632902fd001c38ee5c8c87a213883ca87be
2015-05-15Restructure builds to allow more flexibilitySam Yaple224-49/+62
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-14Merge "Fixes Nova NoVNC"Jenkins5-10/+24
2015-05-13Merge "Add functional tests to tox"Jenkins9-7/+215
2015-05-13Merge "Fix image build for barbican"Jenkins1-1/+3
2015-05-13Add functional tests to toxJeff Peeler9-7/+215
This adds functional tests to tox, along with a number of prerequisite steps. Since this is primarily a bash project, pbr usage has been avoided. Tests are to be written in python and put in the tests directory. Running tox -e setupenv will execute a setup script (tests/setup_docker.sh) to ensure the running instance of docker meets the minimum version requirement. Running tox -e images will execute the image building script (tools/build-all-docker-images) and will parse the resulting output to report failures. Running tox -e startenv will generate the environment file, run "tools/kolla start", and run first time initialization (eventually). Running tox -e functional is for actually testing the deployed OpenStack environment via a series of tests utilizing the client APIs. Change-Id: Iff6dfdca43f0c44d471e7540a7836e56a0de4507
2015-05-13Merge "Improves Heat Demo Functionality"Jenkins4-3/+47
2015-05-13Merge "add restart and destroy subcommands to tools/kolla"Jenkins1-0/+16
2015-05-12Allow private docker registriesSam Yaple2-5/+20
Change the sed seperator to accept a namespace with a private registry and add an option to specify the registry. Below is an example for a registry located at 192.168.0.10:5000. $ ./build-all-docker-images -r 192.168.0.10:5000 The final image name would be something like this: '192.168.0.10:5000/kollaglue/centos-rdo-base' All build, push, and pull commands will still function the same. Change-Id: Ic0ff96bb8119ddfab15b99e9f1e21cfe8d321dab
2015-05-12Improves Heat Demo FunctionalityDaneyon Hansen4-3/+47
Previously, the Heat demo suffered from the following limitations: 1. The number of Nova instances to spawn and the image flavor were hard coded in the Heat template. 2. No outputs existed. This required users to run nova-list to obtain the IP's of VMs. 3. No documentation existed. This patch addresses the above limitations. Change-Id: I495aa9c73a91200c01cecc1719ee5532c1f6c9cb
2015-05-12Fixes Nova NoVNCDaneyon Hansen5-10/+24
Previously, vnc was not completely working properly because nova.conf config flags were not properly implemented in t he correct containers. This patch moves the nova.conf config flags for vnc to the proper containers. Additionally, the patch modifies the proxy client ip param to be consistent with the param within nova.conf and adds all the novnc params to docs. Change-Id: I1944baca64ccd113bbca582784b08f90dc0eff69
2015-05-12Merge "fix net-create call for public1 in tools/init-runonce"Jenkins1-1/+1
2015-05-12Merge "Fix setup script misspelling and pkill flag"Jenkins1-7/+30
2015-05-12Merge "Additional option to cleanup even failed containers"Jenkins1-1/+10
2015-05-12fix net-create call for public1 in tools/init-runonceJustin Riley1-1/+1
The --router:external option is a boolean flag that doesn't take a value (neutron client version 2.5.0). Passing True results in the following error: Invalid values_specs True This patch simply removes the 'True' value. Change-Id: If4b5305f37d50c14c767393eb21223b0e0b59494
2015-05-12add restart and destroy subcommands to tools/kollaJustin Riley1-0/+16
Convenience commands for restarting all containers and destroying all containers Change-Id: I9c4759dbe699bd4b609cefa694ecc897355ff60a
2015-05-12Set release tag to 'latest' for development branchMartin André15-33/+33
Change-Id: I418583af2d2795f4b63ded2aa3e2cbedd70993c8
2015-05-11Merge "Add heat-api-cfn to heat-api-engine yml"Jenkins1-0/+7
2015-05-11Merge "Make a demo for Magnum"Jenkins11-3/+281
2015-05-11Merge "Add Magnum Containers as a Service to Kolla"Jenkins15-0/+176
2015-05-11Fix image build for barbicanJeff Peeler1-1/+3
tar package was missing Change-Id: Ic932455fe341cdb7acfe79c53a450071d1d2b1b6
2015-05-11Add heat-api-cfn to heat-api-engine ymlSteven Dake1-0/+7
Star theat-api-cfn in the main heat-api-engine compose file. Change-Id: Ibe5c9169c606a76470fe9be9c9cc439aaf8d3f0f
2015-05-11Make a demo for MagnumSteven Dake11-3/+281
Make a Magnum demonstration that creates a baymodel and bay. Just run demos/magnum/launch to make it work. This depends on Neutron. Borrow the v1beta3 redis example from the examples repository in Kubernetes. Change-Id: I448a5890bfe0c1675914ae7dbd02fad03f4b1eeb
2015-05-11Add Magnum Containers as a Service to KollaSteven Dake15-0/+176
This adds Magnum Containers as a Service to Kolla. Change-Id: I572cd62845515f42a6a16291d2bd87ad8d972e24 Implements-blueprint: container-magnum
2015-05-11Additional option to cleanup even failed containersSam Yaple1-1/+10
Also support --pull flag to pull the latest version of the base Change-Id: I3205d6e799772138edaf2b0666353c19dfbf52f0
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-08Merge "Updates cleanup-containers"Jenkins1-1/+37
2015-05-08Fix setup script misspelling and pkill flagJeff Peeler1-7/+30
pkill -9 docker was killing setup_docker.sh execution, so add -x flag. Added check for root permissions and host type. Added executing user to docker group. Change-Id: I82cfad64fa737666d888e2ab9350c8d42e2150bf
2015-05-07Merge "linuxbridge check.sh not right"Jenkins1-1/+1
2015-05-08linuxbridge check.sh not rightFang Fenghua1-1/+1
linuxbridge check.sh script got wrong value of status. Change-Id: I975562a62c9ebf7afc22289dc96e672ed877537c Closes-Bug: #1452626
2015-05-07Fixes Nova NOVNC and Consoleauth Startup FailureDaneyon Hansen2-3/+1
Previously these services would not start because the start script requires the associated log file to exist. The default settings for these 2 log files are blank causing the failure. Since the log files are not required for the services to start, this patch removes the parameter requirement from both start scripts. Change-Id: I84d3d128728075e52282b49d9df229917a34a7b5
2015-05-07Add kilo tag to keystone compose fileDaneyon Hansen1-1/+1
Previously, the keystone compose yml was referencing juno instead of kilo when all other services are using kilo. This patch upates the yml to use the keystone image with the kilo tag. Change-Id: Ib4f551ad303bd44f0a5c45fc9d5f7d53f376caf7
2015-05-06Updates cleanup-containersDaneyon Hansen1-1/+37
Previously cleanup-containers suffered from the following limitations: 1. The docker rm command would fail if all the containers were not stopped. 2. The script would throw an error if no containers existed. 3. Artifacts such as veths, bridges, etc.. would remain on the host after containers were removed. These artifacts should be removed if the containers are removed. Change-Id: I5eadb23fec9e34125a32f6c3e39c241d97932910
2015-05-06Nova deprecated proxying options in the DEFAULT groupSteven Dake1-2/+2
In Kilo Nova deprecated proxying options in the DEFAULT group. Instead they were moved to the "neutron" group. This resulted in the metadata service not serving up metadata. See this bug for more information: https://bugzilla.redhat.com/show_bug.cgi?id=1217999 Change-Id: I4f7eac0100d31c5329f8d1857f6d7da1bb6784da
2015-05-06Make neutron work with KiloSteven Dake1-1/+1
Neutron was loading a bunch of modules that are not currently supported in Kolla. Remove them as they were causing problems loading Neutron. Partially-Implements: blueprint port-kilo Change-Id: If53071bbb0a22aa05219b9e99ca6d693f96db4ce
2015-05-06Add lock_path and instances_path to configSteven Dake1-0/+5
Both of these paths were missing from the configuration but they appear necessary for Kilo. I'm not clear on why it worked ok in Juno, perhaps different defaults. Change-Id: I8b7c375627ada860356f9b9fcc205751083b804c Partially-Implements: blueprint port-klo
2015-05-06Move dnsmasq-neutron.conf to /etc/neutron/dnsmasqSteven Dake1-1/+3
The default dnsmasq configuration file doesn't operate with the Kilo agents in /etc/neutron when used with the --config-dir option. Instead move it to a subdirectory. Change-Id: Iab8a54e879f8e630ba38205750ca9670e82834df Partially-Implements: blueprint port-kilo