summaryrefslogtreecommitdiff
path: root/compose
AgeCommit message (Collapse)AuthorFilesLines
2015-05-06Add a novnc container running the novnc-proxy.Harm Weites1-0/+16
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-06Port to JunoSteven Dake13-27/+27
This represents the Juno release of the images. Partially-implements: blueprint port-kilo Change-Id: I2837ec25a2aa093b7fff7519f3ed608ec93736bf
2015-05-06Port to icehouseSteven Dake13-28/+28
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-06Add heat-api-cfnSteven Dake1-0/+7
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-04-28Consolidate tools/conf-* scripts in tools/init-runonceMartin André1-2/+2
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-27Add support for configuring via Neutron networkingSteven Dake1-1/+10
Configure the network for use with Neutron. Co-Authored-By: Daneyon Hansen (danehans@cisco.com) Change-Id: Iab0496cf40683ca29cbe38066ae446aa8c6c4c36
2015-04-27Add a conf-novanet to configure novaSteven Dake1-7/+2
Configure nova networking and nova quotas to allow 40 m1.small instances to run. Checks for keystone credentials set. May only be run once. Change-Id: I36e01d42ec283651babbb59268452a65e644626e
2015-04-21Do not bindmount nova-compute directoriesSteven Dake1-6/+2
Nova uses a data container. Data containers are expected to use the VOLUME keyword and then use volumes_from to access those volumes. Throwing in a bindmount to the host filesystem results in unpredicble behavior, usually in the form of files being stored on the host filesystem that should be persisted in the compute data volume. Change-Id: I60a7873995c9397368ed4df61d5a6d4e8250f3c2
2015-04-16Introduce `tools/kolla` to interact with kollaMartin André1-4/+4
This is supposed to prevent proliferation of scripts in "tools" directory and reduce code duplication. This first patch replaces tools/{start,stop,pull,status} scripts and more commands are to be added in the future. Change-Id: I3d99cf5033be8631d8e6f32a4c34d3b5ffcae7e8
2015-04-13Fixes Spacing in Neutron Agents Compose FileDaneyon Hansen1-1/+1
Previously, compose would generate an error because the neutron-agents.yml file was missing a space for the restart policy line. Change-Id: Ib17c4c726dcfcda780a242ebe22474e9252cac8a
2015-04-13Adds Neutron Agents SupportDaneyon Hansen3-7/+49
Previously, the agents ran in seperate containers. Since some of the agents create and use network namespaces, runnning them in seperate containers has become a challenge. This patch adds neutron agent support in a single container. Partially Implements: blueprint compute-operation-neutron Change-Id: If4f893abd50d90b58e8435ec2659870dce36951c
2015-04-10Adds neutron-server to neutron container-setDaneyon Hansen1-0/+7
Adds neutron-server components of the neutron container set. Partially Implements: blueprint compute-operation-neutron Change-Id: I63525ae85f4ead4e010cdb9b6bc8059bb9d252e7
2015-03-30Merge "Loads ebtables from inside the containers"Jenkins2-0/+6
2015-03-29Merge "Tell mariadb to restart"Jenkins1-0/+2
2015-03-28Loads ebtables from inside the containersSam Yaple2-0/+6
We have to overlay the /lib/modules folder from the host to properly `modprobe` from within a container. We don't have to give it write permissions however, so the docker-compose volume is mounted in as 'ro' Change-Id: I95101136dad56e9331d8b92cd394495f7bd0576a
2015-03-28Tell mariadb to restartSteven Dake1-0/+2
If a system is rebooted with kolla running, all the services will continually restart. There appears to be some locking problem in docker which will result in docker imploding. One problem is a key dependency, mariadb, is never started on a reboot because it is missing restart: always. Also restart the mariadb data container until it returns success. Change-Id: I599d28548ff041712d54a702c80fe36c321adf7f
2015-03-27Partially Implements: Container set compute-operation-neutronDaneyon Hansen1-0/+7
Adds the neutron-linuxbridge-agent to the neutron container set. Change-Id: I20752611c24a3110cc5d2e4fca2d501fc32a4d87
2015-03-25Extends Nova Metadata Service Parameterization and CompositionDaneyon Hansen1-0/+59
Previously, nova enabled_apis was hard coded and metdata_host was using PUBLIC_IP param instead of exposing an individual param. Extending these params and creating a separate compose yml that includes compute/libvirt/network/api is required to support nova network multi_host. Additional details can be found here: http://docs.openstack.org/admin-guide-cloud/content/section_metadata-service.html Change-Id: I5d417a0ee460f8ad9b2982fe83d63ab57013918e
2015-03-22Make mariadb use a data container without a bindmountSteven Dake1-5/+3
A data container is meant to operate without bindmounts. Change-Id: I2624a63fd75db7ed8050054c17e19885f8a7ac8a Co-Authored-By: Daneyon Hansen (danehans@cisco.com)
2015-03-22Make nova-compute-network use a data volume containerSteven Dake1-8/+10
A data volume container is far superior to bind mounting the host's shared directories. It preserves the idempotency, immutability and declarative properties of the containers. The way this works in practice is that a data volume container is created. Then when the containers start they use LVM to access the filesystem where /var/lib/docker is contained. Then the container startup logic bindmounts the data volume stored on the host filesystem in /var/lib/docker/vfs/dir/ID. This prevents people with access to the host operating system from damaging the contents of the data container. It does mean that now we must use tools/stop to stop our containers rather than tools/cleanup-containers -f. This is a containers best practice. For more details see: https://docs.docker.com/userguide/dockervolumes/ Big credit goes to Danyeon Hansen for seeding this idea in the mariadb containers. Note occasionally docker-compose start/stop seems to not want to stop a container. This bug needs to be addressed upstream separately from our utilization of this best practice. Change-Id: Iaa1419f606e1b1b7a7560a095c49e79d643164f1
2015-03-21Merge "Refactors nwfilter"Jenkins1-3/+0
2015-03-21Merge "Make the Horizon dashboard work properly"Jenkins1-0/+7
2015-03-21Merge "Improve Heat integration"Jenkins1-0/+0
2015-03-21Merge "Add pid: host to libvirt"Jenkins1-1/+1
2015-03-20Refactors nwfilterDaneyon Hansen1-3/+0
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-20Make the Horizon dashboard work properlySteven Dake1-0/+7
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-20Improve Heat integrationSteven Dake1-0/+0
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-20Add pid: host to libvirtSteven Dake1-1/+1
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-20Implements: blueprint Implement a database container setDaneyon Hansen1-0/+14
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-20Merge "Move genenv.sh and start.sh to tools directory"Jenkins3-183/+2
2015-03-20Merge "Always restart glance services"Jenkins1-0/+2
2015-03-20Move genenv.sh and start.sh to tools directoryMartin André3-183/+2
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-20Merge "Check for root privilege in start.sh"Jenkins1-0/+5
2015-03-19Always restart glance servicesSteven Dake1-0/+2
Always restart glance services since they are idempotent. Change-Id: I6ad98eacf0fd10b97a007db81dbe23459cc71e2b
2015-03-19Merge "Correct glance-api-registry format"Jenkins1-11/+10
2015-03-19Check for root privilege in start.shJeff Peeler1-0/+5
Change-Id: I38f6cf133b0ebf59a9595fb62868a81f731a0b85
2015-03-19Merge "Implements: blueprint heat-fig-update"Jenkins1-0/+14
2015-03-19Merge "Update start.sh"Jenkins1-50/+35
2015-03-18Make genenv.sh create an environment that will actually start keystoneSteven Dake1-1/+1
The latest keystone container parses the keystone admin port environment variable. This script was setting it incorrectly. Change-Id: I0d85e5266e5198e47b77906639bc121cd1e6d1f5
2015-03-18Merge "Fix an error in the nwfilter definition"Jenkins1-3/+3
2015-03-18Correct glance-api-registry formatSteven Dake1-11/+10
The yaml formatting is wrong, causing some versions of compose to bail. Change-Id: I20c0709699c2c259e9d2443a7d91e5f70ce67188
2015-03-18Update start.shSteven Dake1-50/+35
Clean up start.sh and make more functional Change-Id: If9cb8a6a621991a28cf9b95c4fd0e5b7e780272a
2015-03-18Implements: blueprint heat-fig-updateRyan Hallisey1-0/+14
Heat is split into the engine and api. The current images built in kollaglue work. Change-Id: I14bb8520cf76a84491163f0f102d603d312cd5fb
2015-03-18Merge "Fig config for glance"Jenkins1-0/+13
2015-03-17Fix an error in the nwfilter definitionSteven Dake1-3/+3
The host directory is /etc/libvirt/nwfilter, not /etc/libvirt/nwfilters Change-Id: If7dc4a8028477d938aaa0dba20b79589217ceaf9
2015-03-17Merge "rabbitmq yml file."Jenkins1-0/+7
2015-03-16Fig config for glanceRyan Hallisey1-0/+13
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-16Complete docker compose setup.Ian Main3-0/+216
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-16Change keystone yml file to always restart.Ian Main1-0/+1
Change-Id: I814a369233857da1495028189f855b88bead5a6d
2015-03-16rabbitmq yml file.Ian Main1-0/+7
Change-Id: Ied8798fd1f8c77ce1f800747f25be2d8455e4344