34 Commits

Author SHA1 Message Date
Jenkins
ad6026e0e1 Merge "Refactors nwfilter" 2015-03-21 03:16:24 +00:00
Jenkins
68978c2338 Merge "Make the Horizon dashboard work properly" 2015-03-21 03:15:58 +00:00
Jenkins
a99a861bc0 Merge "Improve Heat integration" 2015-03-21 03:15:38 +00:00
Jenkins
64f59e229c Merge "Add pid: host to libvirt" 2015-03-21 03:12:30 +00:00
Daneyon Hansen
c49613ad0a Refactors nwfilter
Previously, the nwfilter daemon/conf pkgs would need to be
installed on the host. Compose would then mount the host DIR
to the compute containers. A more efficient approach is to simply
install the nwfilter config/daemon in the libvirt container. Both
appoaches address the following error when booting an instance:

'no-mac-spoofing' is missing

Change-Id: I81b446d198920473bf99b97ef5eac6ef5ee85024
2015-03-20 22:00:54 +00:00
Steven Dake
71576f4e42 Make the Horizon dashboard work properly
The Horizon dashboard was not working properly prior to this work.

Also a docker-compose file was added to start the dashboard.

Change-Id: I8a438c15b967b0cec00bfe44b997f833bf745191
2015-03-20 10:21:29 -07:00
Steven Dake
dbddef4f78 Improve Heat integration
Generate Heat environment variables.
Rename yml file to api and engine to follow other service conventions.
Add heat to compose/start
Modify integration guide to include new variables.

Change-Id: I058d829901881e28d6f4785f59fcf778058241e4
2015-03-20 10:21:01 -07:00
Steven Dake
5bfc3e11f6 Add pid: host to libvirt
Without pid: host, nova-compute and libvirt fail to operate correctly
together.  I don't understand why, and I wish it weren't so, but it means
folks will have to install docker-compose from my personal github account
until the pull request is merged upstream.

Change-Id: I24e55405139c831f2df246f54c5b6fd39d00656a
2015-03-20 10:05:03 -07:00
Daneyon Hansen
5547b5fe78 Implements: blueprint Implement a database container set
Previously, the database container was configured for use with
Kubernetes. This patch removed any k8s dependencies, adds a script
to manage mysql server.cnf settings and splits data and app
containers. Splitting the containers provides additional
portability and operational efficiencies compared to host mounts.

Change-Id: I80656450c02dda5f2959d187eec20d5877dc54a2
2015-03-20 16:17:51 +00:00
Jenkins
fb425db56d Merge "Move genenv.sh and start.sh to tools directory" 2015-03-20 16:09:32 +00:00
Jenkins
9b7a844094 Merge "Always restart glance services" 2015-03-20 01:39:08 +00:00
Martin André
888bb9cc8c Move genenv.sh and start.sh to tools directory
Rename them `genenv` and `start`.
Have `genenv` create the openrc file in the top-level directory.

Add openrc and compose/openstack.env to gitignore, as well as *.img.

Change-Id: I5d8006e97efd77cf364215f55d5e585139ae273e
2015-03-20 10:31:02 +09:00
Jenkins
e201fd5206 Merge "Check for root privilege in start.sh" 2015-03-20 00:58:05 +00:00
Steven Dake
096a85da32 Always restart glance services
Always restart glance services since they are idempotent.

Change-Id: I6ad98eacf0fd10b97a007db81dbe23459cc71e2b
2015-03-19 13:18:41 -07:00
Jenkins
f91293cd5d Merge "Correct glance-api-registry format" 2015-03-19 20:02:37 +00:00
Jeff Peeler
0dc0cf1b9e Check for root privilege in start.sh
Change-Id: I38f6cf133b0ebf59a9595fb62868a81f731a0b85
2015-03-19 12:05:22 -04:00
Jenkins
c3b1174351 Merge "Implements: blueprint heat-fig-update" 2015-03-19 15:44:56 +00:00
Jenkins
ac17371249 Merge "Update start.sh" 2015-03-19 13:34:20 +00:00
Steven Dake
97d3792bfe Make genenv.sh create an environment that will actually start keystone
The latest keystone container parses the keystone admin port environment
variable.  This script was setting it incorrectly.

Change-Id: I0d85e5266e5198e47b77906639bc121cd1e6d1f5
2015-03-18 20:08:15 -07:00
Jenkins
16076af97a Merge "Fix an error in the nwfilter definition" 2015-03-18 22:53:35 +00:00
Steven Dake
6aebcbfb53 Correct glance-api-registry format
The yaml formatting is wrong, causing some versions of compose to bail.

Change-Id: I20c0709699c2c259e9d2443a7d91e5f70ce67188
2015-03-18 15:45:11 -07:00
Steven Dake
b8a67110c7 Update start.sh
Clean up start.sh and make more functional

Change-Id: If9cb8a6a621991a28cf9b95c4fd0e5b7e780272a
2015-03-18 15:24:47 -07:00
Ryan Hallisey
2b801dac90 Implements: blueprint heat-fig-update
Heat is split into the engine and api.  The current images
built in kollaglue work.

Change-Id: I14bb8520cf76a84491163f0f102d603d312cd5fb
2015-03-18 17:21:35 -04:00
Jenkins
1f136352ce Merge "Fig config for glance" 2015-03-18 13:31:44 +00:00
Steven Dake
2f2d0ef0cc Fix an error in the nwfilter definition
The host directory is /etc/libvirt/nwfilter, not /etc/libvirt/nwfilters

Change-Id: If7dc4a8028477d938aaa0dba20b79589217ceaf9
2015-03-17 11:45:25 -07:00
Jenkins
af7e8e4187 Merge "rabbitmq yml file." 2015-03-17 15:03:41 +00:00
Ryan Hallisey
011dcfcb0f Fig config for glance
Based off of ccrouch's glance fig.yml file and my install.sh script.

https://github.com/ccrouch/kolla/blob/dev/docker/fig.yml
https://github.com/rthallisey/atomic-osp-installer/blob/master/install.sh

Change-Id: I6a40f54c60e061b5e18cd3748debe59937a575e0
2015-03-16 17:07:14 -04:00
Ian Main
dcb607d369 Complete docker compose setup.
This change proposes a minimal openstack deployment stood up using
docker-compose.  Included is a script to generate the necessary
environment variables for use by the containers as well as an
'openrc'.  There is also a script which demonstrates starting the
included services.

We have this working locally using patched containers and can start
instances with networking etc.  However, there are several changes
required to various containers that will need to be made to get this
working.  We are also using Steven Dake's patches to docker-compose to
allow the use of pid=host.  I propose we either merge this change or
build changes on top of this to get a functioning installation.

Co-authored-by: Ryan Hallisey <rhallise@redhat.com>

Change-Id: I5e6051054d31edf9840c3a22502d4a7963893f29
2015-03-16 12:26:20 -07:00
Ian Main
4f622797ae Change keystone yml file to always restart.
Change-Id: I814a369233857da1495028189f855b88bead5a6d
2015-03-16 12:25:13 -07:00
Ian Main
467182c173 rabbitmq yml file.
Change-Id: Ied8798fd1f8c77ce1f800747f25be2d8455e4344
2015-03-16 11:48:27 -07:00
Ian Main
c2bdaadd7c New nova compute and nova network yml file for docker compose.
This one uses the single environment file and has a few changes
to mounted directories.

Change-Id: I047a92b5ab89aa9b3b75213c19e05eb84d48adf6
2015-03-12 20:51:14 -07:00
Ian Main
7a23a94f9c docker compose file for nova api, conductor and scheduler.
Change-Id: I2341f4b00ece5fb643a0436f30e1065fc1d037b1
2015-03-12 19:33:12 -07:00
Ryan Hallisey
787f5d1b80 Add keystone docker-compose file.
To follow the model of container sets, net will be set to
host so that containers will not need to be linked together.

All enviroment variables will come from 'openstack.env'.

Co-authored-by: Ian Main <imain@redhat.com>

Change-Id: Ifdb0f146ff82c0fedb09255f6e1955ecdc435444
2015-03-12 13:08:33 -04:00
Steven Dake
a4095ffafd Implement nova-compute-nova-net
This provides a nova compute 3 container set.

Implements; blueprint container-set-compute-operation-nova

Change-Id: Ied4a0bece57eedeb680d520ea7c8393d24c89f0a
2015-02-27 21:23:22 -07:00