655 Commits

Author SHA1 Message Date
weiyu
0e00ad2188 fix ansible libary passing error arguments.
kolla is mandatory to run a version of docker-compose that 
includes pid: host support.docker-compose 1.3.0 to include the
necessary features.

docker-compose 1.3.0 project.up() abandoned the parameters 
detach and use allow_recreate replace recreate parameters.
closes-Bug: #1458116

Change-Id: I1235da58db5bedf208ebaea2a54568964dc802f8
2015-06-02 10:49:25 +00:00
Steven Dake
59a2cd4089 Make clenaup-containers bashate compliant
Change-Id: I5469e6e60b9e20ee98c9149697f663e94e58077d
Partially-Implements: blueprint bashate-gate
2015-05-28 08:35:41 -07:00
Steven Dake
07b6000fe9 Make build-all-docker-iamges bashate compliant
Change-Id: I62dbd2c3e0e6f66b1be5777bb8bbda4e43b2b5db
Partially-Implements: blueprint bashate-gate
2015-05-28 08:35:38 -07:00
Jenkins
c59b94a1fe Merge "Clean up the image functional test" 2015-05-27 13:49:55 +00:00
Jenkins
1061cc7692 Merge "Remove unnecessary dependencies" 2015-05-27 04:28:10 +00:00
Jeff Peeler
314b6d4c3c Remove unnecessary dependencies
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-26 17:25:39 -04:00
Jeff Peeler
78b27e3e60 Clean up the image functional test
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-26 15:01:28 -04:00
Steven Dake
751180ae01 Force developers not to run build-docker-image as root
Instead recommend developer run build within the docker group.
This script is non-functional as the root user.

Change-Id: Ib70ab55e5e9bc2e7b8639d5d5ffc32a2b8795058
2015-05-26 13:45:00 -04:00
Steven Dake
23370e52d4 Use latest delorean repo location
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-26 13:44:57 -04:00
Jenkins
e832e35295 Merge "Switch Fedora base image to fedora:21" 2015-05-26 14:39:58 +00:00
Martin André
2844a25102 Always provide a tag when building with build-all-docker-images
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-26 14:20:51 +09:00
Martin André
17aed1ebb3 Switch Fedora base image to fedora:21
Install required iproute package on fedora 21 for 'ip' command to work.

Change-Id: Id98035dbe1eb5c0c76321784956ec15ac5d69068
2015-05-26 10:56:02 +09:00
Jenkins
9249ed0d1d Merge "fix subnet-create call for demo-net" 2015-05-25 13:17:45 +00:00
Jenkins
6b5e691c86 Merge "Restructure builds to allow more flexibility" 2015-05-24 17:52:39 +00:00
Jenkins
ac97b74052 Merge "Set release tag to 'latest' for development branch" 2015-05-18 21:45:03 +00:00
Justin Riley
f77ca0e05b fix subnet-create call for demo-net
(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-18 13:24:40 -04:00
Sam Yaple
13062e23e8 Restructure builds to allow more flexibility
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-15 01:32:22 -05:00
Jenkins
354ba01c8f Merge "Fixes Nova NoVNC" 2015-05-14 17:49:46 +00:00
Jenkins
b7d5053978 Merge "Add functional tests to tox" 2015-05-13 21:54:51 +00:00
Jenkins
a19f8fd990 Merge "Fix image build for barbican" 2015-05-13 21:13:12 +00:00
Jeff Peeler
21cd478cbd Add functional tests to tox
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-13 15:38:07 -04:00
Jenkins
abe4a9ccb2 Merge "Improves Heat Demo Functionality" 2015-05-13 12:56:16 +00:00
Jenkins
4911917805 Merge "add restart and destroy subcommands to tools/kolla" 2015-05-13 12:55:21 +00:00
Sam Yaple
e057343c2f Allow private docker registries
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-12 22:16:59 -05:00
Daneyon Hansen
e65e059852 Improves Heat Demo Functionality
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-12 15:51:37 -07:00
Daneyon Hansen
fa51eb4b53 Fixes Nova NoVNC
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-12 12:11:40 -07:00
Jenkins
52847aa1b9 Merge "fix net-create call for public1 in tools/init-runonce" 2015-05-12 17:34:00 +00:00
Jenkins
427fc0b680 Merge "Fix setup script misspelling and pkill flag" 2015-05-12 16:05:27 +00:00
Jenkins
4aacc43e96 Merge "Additional option to cleanup even failed containers" 2015-05-12 15:48:25 +00:00
Justin Riley
4443392f6e fix net-create call for public1 in tools/init-runonce
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-12 11:23:52 -04:00
Justin Riley
68e4dba46a add restart and destroy subcommands to tools/kolla
Convenience commands for restarting all containers and destroying all
containers

Change-Id: I9c4759dbe699bd4b609cefa694ecc897355ff60a
2015-05-12 11:13:29 -04:00
Martin André
d1b8a1db91 Set release tag to 'latest' for development branch
Change-Id: I418583af2d2795f4b63ded2aa3e2cbedd70993c8
2015-05-12 13:18:09 +09:00
Jenkins
57990a94ae Merge "Add heat-api-cfn to heat-api-engine yml" 2015-05-11 20:00:31 +00:00
Jenkins
603e4b702d Merge "Make a demo for Magnum" 2015-05-11 19:43:20 +00:00
Jenkins
91b283ad10 Merge "Add Magnum Containers as a Service to Kolla" 2015-05-11 19:22:00 +00:00
Jeff Peeler
0976ba6b21 Fix image build for barbican
tar package was missing

Change-Id: Ic932455fe341cdb7acfe79c53a450071d1d2b1b6
2015-05-11 15:12:41 -04:00
Steven Dake
e18140ae50 Add heat-api-cfn to heat-api-engine yml
Star theat-api-cfn in the main heat-api-engine compose
file.

Change-Id: Ibe5c9169c606a76470fe9be9c9cc439aaf8d3f0f
2015-05-11 09:26:08 -07:00
Steven Dake
794a814275 Make a demo for Magnum
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-11 09:26:08 -07:00
Steven Dake
5a06901664 Add Magnum Containers as a Service to Kolla
This adds Magnum Containers as a Service to Kolla.

Change-Id: I572cd62845515f42a6a16291d2bd87ad8d972e24
Implements-blueprint: container-magnum
2015-05-11 09:26:02 -07:00
Sam Yaple
95234ea533 Additional option to cleanup even failed containers
Also support --pull flag to pull the latest version of the base

Change-Id: I3205d6e799772138edaf2b0666353c19dfbf52f0
2015-05-11 08:47:50 -05:00
Harm Weites
861ece743e Move Horizon to / and make it work in the first place.
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-09 21:56:52 +02:00
Jenkins
56e72a6bcf Merge "Updates cleanup-containers" 2015-05-08 16:01:51 +00:00
Jeff Peeler
5609af0f3f Fix setup script misspelling and pkill flag
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-08 11:04:34 -04:00
Jenkins
08f9553339 Merge "linuxbridge check.sh not right" 2015-05-07 16:46:56 +00:00
Fang Fenghua
f374a02a75 linuxbridge check.sh not right
linuxbridge check.sh script got wrong
value of status.

Change-Id: I975562a62c9ebf7afc22289dc96e672ed877537c
Closes-Bug: #1452626
2015-05-08 00:32:54 +08:00
Daneyon Hansen
8b6d7b44b8 Fixes Nova NOVNC and Consoleauth Startup Failure
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-07 16:18:34 +00:00
Daneyon Hansen
bd0fd9502e Add kilo tag to keystone compose file
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-07 00:21:57 +00:00
Daneyon Hansen
556388e737 Updates cleanup-containers
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-06 21:00:38 +00:00
Steven Dake
76bd9e1ab8 Nova deprecated proxying options in the DEFAULT group
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-06 13:54:04 -07:00
Steven Dake
14fb8fd69a Make neutron work with Kilo
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-06 13:54:04 -07:00