summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2015-05-29Merge "Clean up the image functional test" into stable/kilokilo-eolJenkins7-19/+59
2015-05-29Merge "Add functional tests to tox" into stable/kiloJenkins8-5/+210
2015-05-29Merge "Fix image build for barbican" into stable/kiloJenkins1-1/+3
2015-05-29Merge "Switch Fedora base image to fedora:21" into stable/kiloJenkins2-2/+3
2015-05-27Clean 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 (cherry picked from commit 78b27e3e6017ceda4e15c5b2c87516ec3750fd98)
2015-05-27Add functional tests to toxJeff Peeler8-5/+210
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 (cherry picked from commit 21cd478cbd0bf14f9522e088c99399886a8fcf28)
2015-05-27Fix image build for barbicanJeff Peeler1-1/+3
tar package was missing Change-Id: Ic932455fe341cdb7acfe79c53a450071d1d2b1b6 (cherry picked from commit 0976ba6b21d18186f5cc6179bec94aad5d1eabe8)
2015-05-27Switch 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 (cherry picked from commit 17aed1ebb3679706982496658c045cb6e441e61d)
2015-05-27fix 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 (cherry picked from commit 4443392f6e7315328880a2744cd89492045d8507)
2015-05-17Use kilo-1 packages as per documentationSteven Dake1-2/+3
Follow upstream documentation to use kilo packages. Change-Id: Id5265a3086ffdb687ac8d52ea0e328c9be5b2934 Co-authored-by: Daneyon Hanse <danehans@cisco.com>
2015-05-14Fixes 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 (cherry picked from commit fa51eb4b5377e4725c0438fbfe85cdacdab8b3fe)
2015-05-12Update gitreview default branch to stable/kiloMartin André1-0/+1
Change-Id: I8c1b09fc0d94d7f4d6be11656269508e447cda99
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-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-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-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
2015-05-06The Neutron agents need their configuration directory specifiedSteven Dake4-4/+4
Add a --config-dir specification to each agent run. Change-Id: I0426caf2ca17185c0789753d4aa9637c5b4327ec Partially-Implements: blueprint port-kilo
2015-05-06The neutron dockerfile needs an update for KiloSteven Dake2-1/+10
policy.json comes from the openstack-neutron package and is required for the agents to run. So install it. fwaas_driver.ini has been deleted in master and in the kilo branch, but the agents won't run without the file present. So copy one from the Juno release. fwaas_driver.ini is probably not actually required, but there is a configuration problem somewhere in our Neutron code base. We are out of time for the Kilo branch, so this short term workaround should be fine. Change-Id: I154599925308765349634b1a53e598599fc20ec1 Partially-Implements: blueprint port-kilo
2015-05-06Glance has some undefined dependencies in Kilo packagingSteven Dake1-1/+3
Glance has two undefined dependencies. Without installing these dependencies out of band, glance will not operate. Change-Id: I096881467d8e0022d58e6c6f745e610d9332dd82 Partially-Implements: blueprint port-kilo
2015-05-06Make nova read config files for KiloSteven Dake5-5/+5
In Kilo, nova no longer reads the config files automatically. They must be specified in the command line to run the nova-* tools. Change-Id: Ifbdf4fd3f952f7bb65e9937b46cf9b96e262c3b0 Paritally-Impleents: blueprint port-kilo
2015-05-06Port to KiloSteven Dake14-112/+113
Use kilo upstream RPM packages Partially-implements: blueprint port-kilo Change-Id: Ia0b4db5dc8e40c01184871e77458dc718c3c46cd
2015-05-06Add a novnc container running the novnc-proxy.Harm Weites11-7/+95
All VNC-specific configuration bits are moved from nova-api-base to nova-compute and the new nova-novncproxy and nova-consoleauth containers. The compose specification has been updated to reflect this. A future patch will make the desired backend configurable (spice/vnc). Change-Id: I8b64abf125fd1ecd7d3463515e3717dd9bd60420 Blueprint: novnc-container
2015-05-06Readd Zaqar for Juno series since that was where it was introducedSteven Dake6-0/+88
Change-Id: I379844bb46d9ac1b933124b1736b7594700f88a8 Partially-implements: blueprint port-kilo
2015-05-06Port to JunoSteven Dake16-30/+30
This represents the Juno release of the images. Partially-implements: blueprint port-kilo Change-Id: I2837ec25a2aa093b7fff7519f3ed608ec93736bf
2015-05-06Change nova net config to work properly with Neutron for Juno and laterSteven Dake1-6/+6
Change nova networking config to work properly with Neutron Juno and later. Partially-implements: blueprint port-kilo Change-Id: I18c324c34b4c3af8526d32b3e42f426ec519750b
2015-05-06Port to icehouseSteven Dake53-72/+68
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-05-06Remove Zaqar for IcehouseSteven Dake6-97/+0
Zaqar was introduced in Juno, so remove it prior to branching icehouse, then add it back in after branching icehouse. Partially-implements: port-kilo Change-Id: Icce95b4d404e6d8238206716e74f6826bc860860
2015-05-06Setup nova networking properly for IcehouseSteven Dake1-6/+6
This sets up nova networking properly to work with Neutron in the Icehouse release. Partially-implements: blueprint port-kilo Change-Id: I0d37411c61d0d705d1ddf39c25c6610ea04f56f1
2015-05-06Add heat-api-cfnSteven Dake10-18/+80
Add Heat-api-cfn for wait conditions Magnum needs wait conditions in order to operate properly. heat-api-cfn is where wait conditions connect. Change-Id: I56742dd96e4607dc0042d0cef4e18c922f9ed736 Implements: blueprint container-heat-api-cfn
2015-05-06Make neutron-server upgrade the database to headSteven Dake1-1/+1
Rather then upgrading to a specific version of OpenStack, just upgrade to Head. This works for both juno and kilo. Change-Id: I6305218eabd7de0878e24c8fdae968ac6d612175 Partially-implements: blueprint port-kilo
2015-05-06Merge "Add auth role to ansible"Jenkins3-0/+15
2015-05-06Merge "Add setup Docker script"Jenkins1-0/+47
2015-05-05Add auth role to ansibleFang Fenghua3-0/+15
Add a auth role so ansible can deploy keystone. Change-Id: I3f41fe150654451aae6271cce59ddeb807945043
2015-05-05Add setup Docker scriptChen Zhiwei1-0/+47
This script will setup Docker environment for Kolla functional test. This script will not affect the users exist Docker environment, only added a new Docker binary to /usr/local/bin directory. Change-Id: I9669461df198d9192e220b51cba1e034040d7ed3
2015-05-05Initial support for taggable dependenciesMartin André2-5/+19
Introduce a new --no-use-released-parent option to `build-docker-image` that allows specifying whether the parent image uses the same tag as the one that's currently build or the release tag. Default is to use the release tag for parent image, however `build-all-docker-images` script forces it to be the current tag. Change to Dockerfile is coming next. Change-Id: Ief11c9abb722c181ca85f38ee11800dbf4332a5f
2015-05-01remove cirros download from post_start in tools/kollaJustin Riley1-6/+0
The cirros image download and creation now happens in tools/init-runonce. Change-Id: Icb83526c1fbe42b96957dd39ad9e46a1cf450471
2015-04-29neutron subnet-create requires args at the endJustin Riley1-1/+1
The network name must be next to the CIDR otherwise `neutron subnet-create` gets confused. Change-Id: Ie8b19d3824e5e25f80c61f0794595813c80b98da