637 Commits

Author SHA1 Message Date
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
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
Steven Dake
57af5e43c4 Add lock_path and instances_path to config
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-06 13:54:04 -07:00
Steven Dake
2ef9203ece Move dnsmasq-neutron.conf to /etc/neutron/dnsmasq
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-06 13:54:04 -07:00
Steven Dake
4942e642cf The Neutron agents need their configuration directory specified
Add a --config-dir specification to each agent run.

Change-Id: I0426caf2ca17185c0789753d4aa9637c5b4327ec
Partially-Implements: blueprint port-kilo
2015-05-06 13:54:04 -07:00
Steven Dake
dd06c2347b The neutron dockerfile needs an update for Kilo
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-06 13:54:04 -07:00
Steven Dake
5a06b0a075 Glance has some undefined dependencies in Kilo packaging
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-06 13:54:04 -07:00
Steven Dake
747f80e928 Make nova read config files for Kilo
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-06 13:54:04 -07:00
Steven Dake
c81b003309 Port to Kilo
Use kilo upstream RPM packages

Partially-implements: blueprint port-kilo

Change-Id: Ia0b4db5dc8e40c01184871e77458dc718c3c46cd
2015-05-06 13:54:00 -07:00
Harm Weites
5ffc66cd69 Add a novnc container running the novnc-proxy.
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-06 22:32:38 +02:00
Steven Dake
d19adb6a6b Readd Zaqar for Juno series since that was where it was introduced
Change-Id: I379844bb46d9ac1b933124b1736b7594700f88a8
Partially-implements: blueprint port-kilo
2015-05-06 10:01:16 -07:00
Steven Dake
68594d873f Port to Juno
This represents the Juno release of the images.

Partially-implements: blueprint port-kilo

Change-Id: I2837ec25a2aa093b7fff7519f3ed608ec93736bf
2015-05-06 09:58:43 -07:00
Steven Dake
6e11af5985 Change nova net config to work properly with Neutron for Juno and later
Change nova networking config to work properly with Neutron Juno and later.

Partially-implements: blueprint port-kilo

Change-Id: I18c324c34b4c3af8526d32b3e42f426ec519750b
2015-05-06 09:58:43 -07:00
Steven Dake
d30f69bc83 Port to icehouse
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-06 09:58:43 -07:00
Steven Dake
d8a7af93eb Remove Zaqar for Icehouse
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-06 09:58:39 -07:00
Steven Dake
35c17ebb5a Setup nova networking properly for Icehouse
This sets up nova networking properly to work with Neutron in the Icehouse
release.

Partially-implements: blueprint port-kilo

Change-Id: I0d37411c61d0d705d1ddf39c25c6610ea04f56f1
2015-05-06 05:33:55 -07:00
Steven Dake
ea0f5c7efa Add heat-api-cfn
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-06 05:33:55 -07:00
Steven Dake
61cc479e90 Make neutron-server upgrade the database to head
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-06 05:33:55 -07:00
Jenkins
d5222549cb Merge "Add auth role to ansible" 2015-05-06 05:10:15 +00:00
Jenkins
9732e3c5bb Merge "Add setup Docker script" 2015-05-06 03:39:07 +00:00