summaryrefslogtreecommitdiff
path: root/docker
AgeCommit message (Collapse)AuthorFilesLines
2015-05-27Fix image build for barbicanJeff Peeler1-1/+3
tar package was missing Change-Id: Ic932455fe341cdb7acfe79c53a450071d1d2b1b6 (cherry picked from commit 0976ba6b21d18186f5cc6179bec94aad5d1eabe8)
2015-05-27Switch Fedora base image to fedora:21Martin André2-2/+3
Install required iproute package on fedora 21 for 'ip' command to work. Change-Id: Id98035dbe1eb5c0c76321784956ec15ac5d69068 (cherry picked from commit 17aed1ebb3679706982496658c045cb6e441e61d)
2015-05-17Use kilo-1 packages as per documentationSteven Dake1-2/+3
Follow upstream documentation to use kilo packages. Change-Id: Id5265a3086ffdb687ac8d52ea0e328c9be5b2934 Co-authored-by: Daneyon Hanse <danehans@cisco.com>
2015-05-14Fixes Nova NoVNCDaneyon Hansen2-8/+9
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 (cherry picked from commit fa51eb4b5377e4725c0438fbfe85cdacdab8b3fe)
2015-05-11Merge "Add Magnum Containers as a Service to Kolla"Jenkins10-0/+142
2015-05-11Add Magnum Containers as a Service to KollaSteven Dake10-0/+142
This adds Magnum Containers as a Service to Kolla. Change-Id: I572cd62845515f42a6a16291d2bd87ad8d972e24 Implements-blueprint: container-magnum
2015-05-09Move Horizon to / and make it work in the first place.Harm Weites2-2/+22
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-07Merge "linuxbridge check.sh not right"Jenkins1-1/+1
2015-05-08linuxbridge check.sh not rightFang Fenghua1-1/+1
linuxbridge check.sh script got wrong value of status. Change-Id: I975562a62c9ebf7afc22289dc96e672ed877537c Closes-Bug: #1452626
2015-05-07Fixes Nova NOVNC and Consoleauth Startup FailureDaneyon Hansen2-3/+1
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-06Nova deprecated proxying options in the DEFAULT groupSteven Dake1-2/+2
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-06Make neutron work with KiloSteven Dake1-1/+1
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-06Add lock_path and instances_path to configSteven Dake1-0/+5
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-06Move dnsmasq-neutron.conf to /etc/neutron/dnsmasqSteven Dake1-1/+3
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-06The Neutron agents need their configuration directory specifiedSteven Dake4-4/+4
Add a --config-dir specification to each agent run. Change-Id: I0426caf2ca17185c0789753d4aa9637c5b4327ec Partially-Implements: blueprint port-kilo
2015-05-06The neutron dockerfile needs an update for KiloSteven Dake2-1/+10
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-06Glance has some undefined dependencies in Kilo packagingSteven Dake1-1/+3
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-06Make nova read config files for KiloSteven Dake5-5/+5
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-06Port to KiloSteven Dake1-83/+84
Use kilo upstream RPM packages Partially-implements: blueprint port-kilo Change-Id: Ia0b4db5dc8e40c01184871e77458dc718c3c46cd
2015-05-06Add a novnc container running the novnc-proxy.Harm Weites8-6/+66
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-06Readd Zaqar for Juno series since that was where it was introducedSteven Dake5-0/+87
Change-Id: I379844bb46d9ac1b933124b1736b7594700f88a8 Partially-implements: blueprint port-kilo
2015-05-06Port to JunoSteven Dake2-2/+2
This represents the Juno release of the images. Partially-implements: blueprint port-kilo Change-Id: I2837ec25a2aa093b7fff7519f3ed608ec93736bf
2015-05-06Change nova net config to work properly with Neutron for Juno and laterSteven Dake1-6/+6
Change nova networking config to work properly with Neutron Juno and later. Partially-implements: blueprint port-kilo Change-Id: I18c324c34b4c3af8526d32b3e42f426ec519750b
2015-05-06Port to icehouseSteven Dake40-44/+40
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-06Remove Zaqar for IcehouseSteven Dake5-96/+0
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-06Setup nova networking properly for IcehouseSteven Dake1-6/+6
This sets up nova networking properly to work with Neutron in the Icehouse release. Partially-implements: blueprint port-kilo Change-Id: I0d37411c61d0d705d1ddf39c25c6610ea04f56f1
2015-05-06Add heat-api-cfnSteven Dake6-15/+66
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-06Make neutron-server upgrade the database to headSteven Dake1-1/+1
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-04-27Change the default shell to bashChen Zhiwei41-41/+41
Unify the shell to bash in all Kolla scripts. Change-Id: Ib9591b2f8f344eb88455c5e9b7ecf2164fb5960a Implements: blueprint use-bash-shell
2015-04-21Merge "remove wait_for from glance-api"Jenkins1-2/+2
2015-04-21Removes existing network namespaces for neutron-agents containerDaneyon Hansen2-0/+10
Previously, network namespaces would not work correctly when restarting or stop/rm/start the neutron-agents container. This is because network namespaces created within the container are associated to the container's pid: /pid/$CONTAINER_PID/ns/net. With this patch, when a container starts or restarts, the l3/dhcp agent start scripts will remove any existing qrouter/qdhcp network namespaces before starting the agents. The agents will recreate the necessary network namespaces since they are stored in the db. Closes-Bug: 1444219 Change-Id: Ia86729766fe8c2fc145b3a02d519746b149a73bb
2015-04-15Add workaround to work with cirros imageSteven Dake1-0/+8
The cirros image uses an old dhcp client which does not work properly with hardware that has checksum offload enabled. Add a bootp rule to rewrite the checksum via iptables. Latest cirros 0.3.33 is afflicted by this bug. Change-Id: Ibfd1f87af5d0bef9fcb1354121e76e4e0db8ab5e
2015-04-14Neutron doa in current formSteven Dake6-7/+7
The nova-config.sh script was exiting because of incorrect shell syntax. The correct syntax for a regex search is [[ haystack =~ needle ]]. The .*needle.* is unnecessary. I think this shell script exited because a period was missing. Change-Id: I3aca5e0729eb5fedbe9ecb4d75ed85d5a1c7815a
2015-04-14remove wait_for from glance-apiSteven Dake1-2/+2
For some reason glance sometimes fails to permanently find keystone while other services do find keystone. The host also has full access to keystone. Change wait_for to fail_unless. This could be a docker bug, a wait_for bug, or some other problem. Change-Id: I02d611d65b7ffddb9c27101fd60e2a8b7cc25658
2015-04-14CentOS 7.1 image doesn't work with libvirtSteven Dake1-0/+4
The libvirt package has a dependency on systemd-libs and systemd, while the centos 7.1 container installs systemd-container-libs and systemd-container. We don't need either of these systemd tools but they reuslt in a broken build of the system if they are missing. As is, the libvirt container will not build. Change-Id: I8e5aac0e3a7e9d88a81733a3048971fe9d48ba56
2015-04-13Removes check_required_vars for Log FilesDaneyon Hansen8-15/+7
Previously, check_required_vars was requiring log file variables to be set in openstack.env. This would cause an error when starting nova/neutron containers that used default (blank) log file settings. Since the log files are not required for the services to start, the default log files are left blank (without a value in the K/V pair). This patch removes the log_file variable for check_required_vars in each nova/neutron script. Change-Id: I169baab28f63a0e0ae06c8aef21b5e8d3155bdda
2015-04-13Adds Neutron Agents SupportDaneyon Hansen30-297/+379
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 Hansen5-54/+91
Adds neutron-server components of the neutron container set. Partially Implements: blueprint compute-operation-neutron Change-Id: I63525ae85f4ead4e010cdb9b6bc8059bb9d252e7
2015-04-07Adds Initial Logging SupportDaneyon Hansen12-15/+81
Previously, logging was hard coded into the nova and neutron containers. This patch creates two common params for logging: DEBUG_LOGGING VERBOSE_LOGGING and sets default values of verbose=true and debug=false. This patch implements logging for Nova and Neutron. Add'l OS service config scripts and images will need to be updated to use the logging params. Change-Id: I03d48005d5b4789aa3c519879a20d963ef1cbaa3
2015-04-07Merge "Remove building of pam+noaudit and place in copr instead"Jenkins2-10/+16
2015-04-07Merge "libvirtd provides was removed from centos7.1"Jenkins1-1/+3
2015-04-06Remove EXPOSE options from DockerfilesSteven Dake8-17/+0
The EXPOSE options will create a local docker-proxy. This is unnecessary with --net=host mode. The docker-proxy adds about 20 microseconds of latency. Add documentation to the specification to indicate where to find the ports that are exposed by the services in case someone were to desire to add EXPOSE back to the Dockerfiles. Change-Id: I398e922fe096d6022a2d5985bb92498f89a5ea31
2015-04-06Remove building of pam+noaudit and place in copr insteadSteven Dake2-10/+16
COPR is a repository for third party packages built by the Fedora build system. Instead of dragging in 250MB of dependencies to build pam, build externally and load only the RPM into the image. The pam that is built externally is built with the --with-noaudit flag and a Provides: pam line. Change-Id: I28396996943d2fdc12b253faf62af8623c8b0e73
2015-04-06libvirtd provides was removed from centos7.1Steven Dake1-1/+3
the libvirtd package "Provides" wwas removed from the libvirt packaging. To workaround this problem just install libvirt-daemon in CentOS 7.1 or Fedora 20+. WIthout this change, an install of libvirtd does not actually install libvirtd. The yum tool will not fail if libvirtd is specified so we weren't catching this in the build. Change-Id: I81e64f6f659aa0466369dad4b0574ebb24c99555
2015-04-03Merge "Load appropriate modules for libvirt"Jenkins1-0/+11
2015-04-02Merge "Simplify `wait_for` calls"Jenkins3-8/+3
2015-04-02Merge "Deal with CentOS 7.1 breakage"Jenkins1-0/+4
2015-04-01Deal with CentOS 7.1 breakageSteven Dake1-0/+4
The baseurl is busted in CentOS latest RDO images Change-Id: Id619a28a6207a8c70835a12416e6f7b432d49811
2015-04-01Load appropriate modules for libvirtSam Yaple1-0/+11
Loads ebtable_nat, ip6_tables, ip_tables, and the appropriate kvm module if the cpu supports it. Change-Id: I69995b06da6da4169a2f0d207608543820d8a89e
2015-04-01Simplify `wait_for` callsMartin André3-8/+3
Rely on the the `check_for_*` functions and remove redundant `fail_unless_*` calls. Also change `wait_for` to exit when it is missing a required argument. Change-Id: I90c4545691d53185556e2838303ac3df0afaf9fa