aboutsummaryrefslogtreecommitdiff
path: root/docker
AgeCommit message (Collapse)AuthorFilesLines
2015-10-07Remove an oslo.message 2.2.0 pinSteven Dake1-10/+0
In https://bugs.launchpad.net/kolla/+bug/1483667, oslo.messaging was pinned to 2.2.0. This pin is no longer necessary as this bug has been fixed upstream. backport: liberty TrivialFix Change-Id: Ica9ae41876a754291d4c6ee1235f6e69a4213463
2015-10-08Merge "Remove which from neutron-server"Jenkins1-12/+0
2015-10-08Merge "Remove debug output in base image yum command"Jenkins1-1/+1
2015-10-07Fix up ironic Dockerfiles to buildJeff Peeler2-8/+2
The dockerfiles for each of these containers were hacked to force install the most recent version of the package, even though the newer version had a lower version number. Delorean has fixed the issue by bumping the epoch, so the hack is no longer required. backport: liberty Change-Id: I8d9c071d84e53280d3cadfceb9034bb96f64f3a3 Closes-bug: #1503785
2015-10-07Merge "Removing /dev/log on rsyslog start"Jenkins2-0/+7
2015-10-07Merge "Install agent dependencies from source for CentOS"Jenkins1-1/+10
2015-10-07Merge "Enable source for openstack-base for RPM distros"Jenkins2-20/+21
2015-10-07Removing /dev/log on rsyslog startMichal Jastrzebski2-0/+7
Currently we seem to be experiencing races between containers. If another containers tries to write to rsyslog before rsyslog container is up and running it will create /dev/log as directory, and that will prevent rsyslog from starting. Change-Id: I88ac27693d12e605f95e3a945fc98783516d7933 Closes-Bug: #1501694 backport: liberty
2015-10-06Install agent dependencies from source for CentOSSteven Dake1-1/+10
Several packages are not installed from RPM packages which are required in order for CentOS from source to operate correctly. This looked like sudo was failing to execute, but it was because the dnsmasq binary was not found. backport: liberty Change-Id: If23cfbacd55d9089ffec442399ee0151adea923f Closes-Bug: #1503412
2015-10-06Enable source for openstack-base for RPM distrosSteven Dake2-20/+21
Make openstack-base optimized for from source builds for RPM based distributions. backport: liberty Change-Id: I5f1056ebc09fd55cd5d46da7a09331e38940d888 Implements: blueprint openstack-common-container
2015-10-06Remove which from neutron-serverSteven Dake1-12/+0
The which tool is installed in the base image now and this extra install is duplicated and has no effect. backport:liberty TrivialFix Change-Id: I70c3edb11f5c847063b6e4ab4f9de7184356ce57
2015-10-06Remove debug output in base image yum commandSteven Dake1-1/+1
The base image contains -d 10 in a yum command which prints unhelpful debug output for one of the yum commands. Remove the extranous debug output. backport: liberty TrivialFix This patch is a trivial fix and is a test to set boundaries on what a trivial fix looks like that doesn't require a bug tracker entry. If reviewers feel a trivial fix isn't documented properly by this commit message, please weigh in, as this is a slight suggested change to our policy as first institued by the Magnum community and brought to my attention by Jeff Peeler. Hopefully this compromise won't be abused :) Change-Id: I57f00978d0baaefd73592f4ad6a655e663d83478
2015-10-06Pin rabbitmq to 3.5.5Steven Dake1-2/+6
Pin rabbitmq to 3.5.5 for RPM platforms. This version is the latest and sparkly with lots of bug fixes. Tested multi-node HA and everything seems solid in comparison to the 3.3.z releases used previously. backport: liberty Change-Id: I53bf70175fd12ded132141aa499c73919a932cdf Closes-Bug: #1503280
2015-10-06Bring Kolla inline with FHSSam Yaple34-51/+49
This brings Kolla images inline with FHS and should make finding locations of things more consistent and reliable with the linux world at large. Change-Id: Iece5b4da4bace0fb8b1f41a65ab2c852ec73e6f8 Closes-Bug: #1485742
2015-10-06Common start.shSam Yaple161-961/+167
The majority of the start.sh code is identical. This removes that duplicate code while still maintaining the ability to call code in a specific container. The start.sh is moved into /usr/local/bin/kolla_start in the container The extend_start.sh script is called by the kolla_start script at the location /usr/local/bin/kolla_extend_start . It always exists because we create a noop kolla_extend_start in the base directory. We override it with extend_start.sh in a specific image should we need to. Of note, the neutron-agents container is exempt from this new structure due to it being a fat container. Additionally, we fix the inconsistent permissions throughout. 644 for repo files and the scripts are set to 755 via a Docker RUN command to ensure someones local perm change won't break upstream containers. Change-Id: I7da8d19965463ad30ee522a71183e3f092e0d6ad Closes-Bug: #1501295
2015-10-04PXE for Ironic for ubuntuSam Yaple3-27/+20
This makes Ironic build properly from source. Change-Id: Ic61cd945760843aae1f0a01738bca3b818fd2f69 Closes-Bug: #1500577
2015-10-01Merge "Lock down ansible version"Jenkins1-1/+1
2015-09-30Lock down ansible versionSam Yaple1-1/+1
We can lock down to this alpha version as long as it works once. That is the value of building an image here. We likely won't run into any bugs if we can deploy from this tag at least once. Change-Id: I864290260d7fbdcd8325748788d2454d1dc1a699 Closes-Bug: #1501455
2015-09-29Merge "Make a openstack-common container for CentOS variants"liberty-rc1Jenkins2-85/+35
2015-09-29Make a openstack-common container for CentOS variantsSteven Dake2-85/+35
Only implements CentOS (RPM family) binary in openstack-common. Change-Id: I5249d0ffaf4c0c946ee2347d5519391ded160cea Partially Implments: blueprint openstack-common-container
2015-09-29Merge "Fix ceph after config-external removal"Jenkins1-3/+5
2015-09-29Merge "Remove config-external for rsyslog"Jenkins2-17/+0
2015-09-29Merge "Make libvirt function on CentOS"Jenkins1-0/+8
2015-09-29Merge "Neutron Agents json support"Jenkins8-137/+19
2015-09-29Merge "Make oslo.log work correctly on RDO platforms"Jenkins1-7/+5
2015-09-29Fix ceph after config-external removalSam Yaple1-3/+5
Change-Id: I46dc2f02dda8219878eee3755b0891f4c3450682 Partially-Implements: blueprint replace-config-external
2015-09-29Make libvirt function on CentOSSteven Dake1-0/+8
Recent regressions in the code base removed permission setting of /dev/kvm to root:kvm 660 permissions which are default for CentOS's version of libvirt. Also Libvirt must be able to read its cnofiguration file, which was previously 600 root:root. Now its 644 root:root so its always readable. This is fine, since this file doesn't contain any secret information. Change-Id: Id87cf5da8e37bc5bb613ce919d0293803d0fe5ed Closes-Bug: #1500733
2015-09-28Neutron Agents json supportRyan Hallisey8-137/+19
Neutron Agents is a special case for json support. Since it's a fat container, there will be multiple commnds that will need to be run in the container. In order to account for this, the commands will be hardcoded until the agents are split out to their own containers. The files will be copied the normal way. Co-Authored-By: Steven Dake <stdake@cisco.com> Change-Id: I9fc226cc7b82c2594db5814d30d453a29a4af8c0 Partially-Implements: blueprint replace-config-external Closes-Bug: #1500566
2015-09-28Make oslo.log work correctly on RDO platformsSteven Dake1-7/+5
RDO has backported the oslo.log fix but Ubuntu from source does not have the proper version of oslo.log with the error correction for syslog. Change-Id: If91200397e02cf5b696d34d9aa4d6980fbba36c6 Partially-Implements: bp logging-container
2015-09-29Merge "Add Ansible support for Ironic"Jenkins11-47/+71
2015-09-28Merge "Make oslo.log work properly with syslog"Jenkins2-0/+51
2015-09-28Remove config-external for rsyslogSam Yaple2-17/+0
Additionally, fix privleges for rsyslog container. It needs to be privleged otherwise it will complain about creating device node Change-Id: I364858f0a1df01b53cee46db3ec7cd5ecbe82c54 Partially-Implements: blueprint replace-config-external
2015-09-28Make oslo.log work properly with syslogSteven Dake2-0/+51
The syslog support in oslo.log is broken. This patch makes oslo.log work properly by using a backported patch from master. Change-Id: Idb7b38e3cecbfd6547dad148f22f13a4c8557c8f Implements: bp logging-container
2015-09-28Add Ansible support for IronicJeff Peeler11-47/+71
Configuration based off upstream documentation here: http://docs.openstack.org/developer/ironic/deploy/install-guide.html A few notes: -ironic-api is not configured to use mod_wsgi -several places it's noted that discoverd is going away and needs to be replaced with ironic-inspector - (sqlite connection should be changed too) -currently enabling ironic reconfigures nova compute (driver and scheduler) as well as changes neutron network settings -a nice enhancement would be to configure the web console Required post-deployment configuration: Create the flat network to launch the instances: neutron net-create --tenant-id $TENANT_ID sharednet1 --shared \ --provider:network_type flat --provider:physical_network physnet1 neutron subnet-create sharednet1 $NETWORK_CIDR --name $SUBNET_NAME \ --ip-version=4 --gateway=$GATEWAY_IP --allocation-pool \ start=$START_IP,end=$END_IP --enable-dhcp And then the above ID is used to set cleaning_network_uuid in the neutron section of ironic.conf. Change-Id: I572e7ff1f23c4e57a2c50817cafe9269fd9950dd Implements: blueprint ironic-container
2015-09-28Merge "Rename ovs to openvswitch"Jenkins6-2/+2
2015-09-28Merge "Convert ceph to json"Jenkins4-69/+3
2015-09-28Merge "Allow conf files to be optional"Jenkins1-6/+17
2015-09-28Rename ovs to openvswitchSam Yaple6-2/+2
Our openvswitch image does not follow the naming convention of any of our other containers and it should. Change-Id: If1b815117bb39df74061218e48778479b8d674bc Closes-Bug: #1500392
2015-09-28Merge "Heat doesn't need to specify python-oslo-reports"Jenkins1-8/+1
2015-09-28Merge "Significant refactor of base image"Jenkins1-28/+59
2015-09-28Merge "Implement a install_type and install_metatype"Jenkins89-88/+89
2015-09-28Convert ceph to jsonSam Yaple4-69/+3
Remove ceph debug info and unused partuuid Change-Id: Ifbe9890979ee666d7e43a04376f36c41ae2d8add Implements: blueprint ceph-container Partially-Implements: blueprint replace-config-external
2015-09-28Allow conf files to be optionalSam Yaple1-6/+17
There are situations where we need to copy-if-exists mainly in cluster setups. This is needed to replace config-external for ceph right now Change-Id: I3c0898d8c584338a38e6ce4c4146e145910c5a52 Partially-Implements: blueprint replace-config-external
2015-09-28Merge "remove set_configs"Jenkins67-303/+10
2015-09-28Merge "Remove quotes from subshell call in bash script"Jenkins2-4/+4
2015-09-28Heat doesn't need to specify python-oslo-reportsSteven Dake1-8/+1
This package is correctly specified in the dependencies of the heat packaging now so removing it from the base package. Change-Id: I9028f41f5ee95b728c425235846b9825501b6f70 Implements: blueprint rhel-based-image-support
2015-09-28Significant refactor of base imageSteven Dake1-28/+59
This refactor organizes the code as follows: If RPM family: execute YUM repo setup if binary install binary tools if source install source tools IF DEB family: install source tools I have tested building and everything seems fairly solid except possilby RHOS. The long term goal of this patch is to allow us to add our own repos in the "execute YUM repo setup" section of the base file based upon OpenStack Infrastructure YUM repos. Partially-Implements: blueprint rhel-based-image-support Change-Id: I759fb8fc050973460c9c69bb500de68e88a68b3b
2015-09-28Implement a install_type and install_metatypeSteven Dake89-88/+89
This prepares for the RHEL OSP implementation by making the build tool convert all binary-* into an install_type of binary and * into an install_metatype variable substitution inside the Dockerfiles. Further binary-* is substituted as install_name to enable proper building only. Change-Id: Ib681b29176eb79a3cab12ec824313fdecb6e7a5f Partially-Implements: blueprint rhel-based-image-support
2015-09-28Remove quotes from subshell call in bash scriptZhao Lei2-4/+4
Always no quotes for $() statement. We don't need quotes to hold blanks in result: # i=$(echo 1 2 3) # echo $i 1 2 3 # These quotes can make something wrong in some case: # i=$(echo '!') # # i="$(echo '!')" -bash: !: event not found # No real problem for current code, only to use a better code style. Change-Id: I06520f4b11ea6b56c4e73049b6f38bfc62fe1392 Closes-Bug: #1499716 Signed-off-by: Zhao Lei <zhaolei@cn.fujitsu.com>
2015-09-28Merge "Remove all fail sections for Ubuntu"Jenkins18-119/+44