621 Commits

Author SHA1 Message Date
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
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
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
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
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
Fang Fenghua
5a1b0008f2 Add auth role to ansible
Add a auth role so ansible can deploy
keystone.

Change-Id: I3f41fe150654451aae6271cce59ddeb807945043
2015-05-05 19:08:47 +00:00
Chen Zhiwei
69316556d1 Add setup Docker script
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-05 16:56:10 +08:00
Martin André
047683d12c Initial support for taggable dependencies
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-05 12:45:11 +09:00
Justin Riley
844d710a48 remove cirros download from post_start in tools/kolla
The cirros image download and creation now happens in
tools/init-runonce.

Change-Id: Icb83526c1fbe42b96957dd39ad9e46a1cf450471
2015-05-01 12:38:33 -04:00
Justin Riley
c1ae401823 neutron subnet-create requires args at the end
The network name must be next to the CIDR otherwise `neutron
subnet-create` gets confused.

Change-Id: Ie8b19d3824e5e25f80c61f0794595813c80b98da
2015-04-29 22:17:24 -04:00
Jenkins
a59918375f Merge "Make the demo use the default key mykey" 2015-04-30 01:45:28 +00:00
Steven Dake
32b53e1272 Make the demo use the default key mykey
The old key defaulted to sdake which was incorrect.

Change-Id: I76a87d2e7da17a245f6ee339db4fd4149ddfe5ff
2015-04-30 01:40:59 +00:00
Jenkins
1bf3bb4e32 Merge "Preserve file attributes when copying image dirs for build" 2015-04-30 01:12:15 +00:00
Jenkins
90ae33a3df Merge "Consolidate tools/conf-* scripts in tools/init-runonce" 2015-04-28 15:41:48 +00:00
Jenkins
4887662c45 Merge "Change the default shell to bash" 2015-04-28 12:40:43 +00:00
Qiu Yu
6b159e78f5 Preserve file attributes when copying image dirs for build
Add "-a" to preserve file attributes so that unnecessary Docker image
build can be avoided. Otherwise, build-all-docker-images will generate
additional image layer due to timestamp change.

Change-Id: I893fa0637937c521198f50b1bba203a27c9f00a3
Closes-Bug: 1449287
2015-04-28 12:33:10 +08:00
Martin André
90ad52c4c1 Consolidate tools/conf-* scripts in tools/init-runonce
Fix issues reported in https://review.openstack.org/#/c/177681/3, and
simplify detection of cirros images in glance.

Only add developer's SSH key to nova if ~/.ssh/id_rsa.pub exists and is
readable.

Change-Id: I5936c6db399d63902d460b0d3c959619073cc3cc
2015-04-28 12:15:42 +09:00
Jenkins
5f1cfa824f Merge "Add support for configuring via Neutron networking" 2015-04-28 03:07:39 +00:00
Jenkins
ca1d1c0fa6 Merge "Add a conf-novanet to configure nova" 2015-04-27 22:27:33 +00:00
Jenkins
476f9c4dea Merge "Add a demo using Heat" 2015-04-27 21:31:10 +00:00
Steven Dake
716eeae386 Add support for configuring via Neutron networking
Configure the network for use with Neutron.

Co-Authored-By: Daneyon Hansen (danehans@cisco.com)

Change-Id: Iab0496cf40683ca29cbe38066ae446aa8c6c4c36
2015-04-27 14:22:23 -07:00