aboutsummaryrefslogtreecommitdiff
path: root/docker
AgeCommit message (Collapse)AuthorFilesLines
2016-03-08Merge "Fix ubuntu marathon container"Jenkins1-0/+7
2016-03-08Fix ubuntu marathon containerArtur Zarzycki1-0/+7
When we install mesos if it(or some deps) doesn't find java it installs gcj(java5) which generate cacerts, so later in marathon we have situation that openjdk8 can't access(discover as broken) to it because of different format. Additionaly this third-party openjdk8 has in dependencies ca-certificates-java which need java to generate cacerts file. Change-Id: Ic4467529a842ffc4bdd99ac1e23abbdee3a82422 Closes-bug: #1552626
2016-03-07Merge "Fix type - python-olso-db for ceilometer"Jenkins1-1/+1
2016-03-07Fix type - python-olso-db for ceilometerHui Kang1-1/+1
TrivialFix Change-Id: I58c60025ae536729d9f953a6f2e8a3ed22177179
2016-03-07Fix "wait for log socket" in start.shÉric Lemoine1-1/+1
The code in docker/base/start.sh that waits for the log socket does not work because it includes a bad "space" character after "-S". This patch changes that character to a real "space" character. It also sets the SKIP_LOG_SETUP envvar for the Heka container. TrivialFix Change-Id: I17a3005df5bbd57678350fc77030e44b5ad6acae
2016-03-05Merge "Make Heka send logs to Elasticsearch"Jenkins2-2/+2
2016-03-05Make Heka send logs to ElasticsearchÉric Lemoine2-2/+2
This patch includes changes relative to integrating Heka with Elasticsearch and Kibana. The main change is the addition of an Heka ElasticSearchOutput plugin to make Heka send the logs it collects to Elasticsearch. Since Logstash is not used the enable_elk deploy variable is renamed to enable_central_logging. If enable_central_logging is false then Elasticsearch and Kibana are not started, and Heka won't attempt to send logs to Elasticsearch. By default enable_central_logging is set to false. If enable_central_logging is set to true after deployment then the Heka container needs to be recreated (for Heka to get the new configuration). The Kibana configuration used property names that are deprecated in Kibana 4.2. This is changed to use non-deprecated property names. Previously logs read from files and from Syslog had a different Type in Heka. This is changed to always use "log" for the Type. In this way just one index instead of two is used in Elasticsearch, making things easier to the user on the visualization side. The HAProxy configuration is changed to add entries for Kibana. Kibana server is now accessible via the internal VIP, and also via the external VIP if there's one configured. The HAProxy configuration is changed to add an entry for Elasticsearch. So Elasticsearch is now accessible via the internal VIP. Heka uses that channel for communicating with Elasticsearch. Note that currently the Heka logs include "Plugin elasticsearch_output" errors when Heka starts. This occurs when Heka starts processing logs while Elasticsearch is not yet started. These are transient errors that go away when Elasticsearch is ready. And with buffering enabled on the ElasticSearchOuput plugin logs will be buffered and then retransmitted when Elasticsearch is ready. Change-Id: I6ff7a4f0ad04c4c666e174693a35ff49914280bb Implements: blueprint central-logging-service
2016-03-05Merge "Bump ansible version to head of devel"Jenkins3-7/+1
2016-03-04Merge "Fix horizon with ssl"Jenkins1-3/+5
2016-03-04Merge "Retry token retrival in keystone bootstrap script"Jenkins1-2/+8
2016-03-04Retry token retrival in keystone bootstrap scriptSamYaple1-2/+8
TrivialFix Change-Id: I83da0298067d5f37603c52fb312828ea1fbbb00c
2016-03-04Merge "Set mongodb log file to shared volume by heka"Jenkins1-0/+8
2016-03-04Bump ansible version to head of develSamYaple3-7/+1
bcoca has asked we use head of devel to fix the loader issue TrivialFix Change-Id: Ie6f4b6bbdffed9a85c840a4f425d866fc5402f4b
2016-03-04Set mongodb log file to shared volume by hekaHui Kang1-0/+8
TrivialFix Change-Id: I085ef2884749bb4ecc546b78052a5688e8b36ad3
2016-03-04Fix horizon with sslSamYaple1-3/+5
Ubuntu did not have mod_headers enabled by default Remove unused variable and adjust 'when' conditional positioning TrivialFix Change-Id: I82b8724526c24f4481a80165520d624f6a02c336
2016-03-04Merge "Reconfigure cinder service"Jenkins1-2/+8
2016-03-03Merge "When ansible fails it still reads chaged key"Jenkins1-1/+1
2016-03-03Merge "Make Heka collect Manila logs"Jenkins3-4/+19
2016-03-03When ansible fails it still reads chaged keySamYaple1-1/+1
Add changed key failure as well. Closes-Bug: #1552405 Change-Id: Ic25a57ba20928bee136932cc422713e76dcbe2a1
2016-03-03Merge "Fix Keystone v3 and Horizon"Jenkins4-20/+19
2016-03-03Merge "Bump to latest ansible and deps"Jenkins3-4/+10
2016-03-03Merge "Libvirt needs openvswitch to connect br-int"Jenkins1-0/+3
2016-03-03Merge "ADD user neutron to the neutron-openvswitch-agent docker file"Jenkins1-0/+2
2016-03-03Make Heka collect Manila logsMauricio Lima3-4/+19
Partially implements: blueprint heka Change-Id: I3fadbf29f5219a293b8b1114d192e27888be2c59
2016-03-03Fix Keystone v3 and HorizonSamYaple4-20/+19
After our switch to keystone-manage bootstrap Horizon is not happy due to v3 not being setup correctly. This patch fixes that This also includes removal of unused variables (transforms them into endpoint url variables) TrivialFix Change-Id: I1e04db8c24049f80e974c063f03068a2ab32a563
2016-03-03Bump to latest ansible and depsSamYaple3-4/+10
Ansible is pinned to single commit in devel branch to pull in the latest shade module we need (domain control). It will be available in ansible 2.1 TrivialFix Change-Id: I4c21fa1d2cec30d4aeb80e050ef4a62332f9ed45
2016-03-03Libvirt needs openvswitch to connect br-intRyan Hallisey1-0/+3
Libvirt is trying to create a port on br-int and is failing because ovs is not installed. Co-authored-by: Ian Main <imain@redhat.com> Closes-bug: 1552717 Change-Id: I6ed0c1ae5b27b58e4c22bcbe7e674f66cde48990
2016-03-02Reconfigure cinder serviceJeffrey Zhang1-2/+8
Change-Id: I8d207d1782acfebf5c07de39df3257fd9bdbbada Partially-implements: bp kolla-reconfig
2016-03-02Merge "Sanity check for swift"Jenkins1-0/+4
2016-03-01ADD user neutron to the neutron-openvswitch-agent docker fileHui Kang1-0/+2
Neutron containers share the same log directory. So all containers should use same username to create directories. Change-Id: Id95a3205b53dd87ba21d55ebecada89d9f86d37b Closes-Bug: #1551829
2016-03-01Merge "Fix missing libraries for ceilometer"Jenkins1-0/+2
2016-03-01Fix missing libraries for ceilometerHui Kang1-0/+2
Change-Id: I5571a5639f9f1b5cb0c8ea87188c3d0b9557cba7 Closes-Bug: #1551407
2016-03-01Merge "Move ironic-discoverd to ironic-inspector"Jenkins2-6/+5
2016-03-01Remove keystone admin tokenSamYaple2-6/+84
Admin token has been deprecated upstream. It will be removed in O. We switch over to the new `keystone-manage bootstrap` method for creating the initial admin user, role, and project. Co-Authored-By: Sam Yaple <sam@yaple.net> Change-Id: I6ca90e8d4c3b71009e24b049b2efbc08c05ebfbf
2016-02-29Sanity check for swiftEugene Bagdasaryan1-0/+4
This runs first sanity check for swift. Once swift is deployed it checks list() Change-Id: I613bf9f2893d66814863893ec5acde5aa252548d Partially-Implements: blueprint sanity-check-container
2016-02-29Move ironic-discoverd to ironic-inspectorAllen Gao2-6/+5
Closes-Bug: #1551052 Change-Id: Ic226287bbf1f1e8d5cc2e1d80ce2975448b1f95c
2016-02-28Merge "Sanity check for cinder"Jenkins1-0/+4
2016-02-28Merge "Reconfigure keystone service"Jenkins1-3/+50
2016-02-27Sanity check for cinderjvora1-0/+4
This runs first sanity check for cinder. Once cinder is deployed it checks volumes.list() Change-Id: I1b4cc57f21cf0fa52a391229c2c2b3fa995d32a8 Partially-Implements: blueprint sanity-check-container
2016-02-28No need the keystone-dist-paste.ini fileJeffrey Zhang1-1/+0
This file is in the expected path when using CentOS binary install TrivialFix Change-Id: Ic64d2bed4791250065464b6bdb6cc0992c858aaf
2016-02-27Reconfigure keystone serviceJeffrey Zhang1-3/+50
Partially-implements: bp kolla-reconfig Change-Id: Ied293e59bf4531e88a0e5e5bf9a5f5f495d2a0e7
2016-02-26Fix parsing of RabbitMQ logsÉric Lemoine1-0/+2
Currently Heka fails to parse the RabbitMQ logs. There are two problems: 1. The rabbit-sasl.log file is ignored but the file_match expression does not match. 2. The delimiter used in the RegexSplitter makes Heka stop on the very first log entry. '\n\n(=[^=]+====' (with two \n's) is a better delimiter. deliver_incomplete_final is used to get the final log entry. TrivialFix Change-Id: I94720340d5b2d6fd5d7641b9ff58733f6cd882ee
2016-02-26Merge "nova-libvirt is not a child of nova-base"Jenkins1-2/+2
2016-02-25Merge "Import module rather than funciton in the set_configs.py file"Jenkins1-2/+2
2016-02-25nova-libvirt is not a child of nova-baseSamYaple1-2/+2
The permissions fix was not applied due to a recent patch. Related-Id: I37d737509bc7cf3dc74bb13ecb0a6ae68080556e TrivialFix Change-Id: Ica737a8e51cdb66b06a09b5484a4915d6e26ee06
2016-02-25Merge "Pin ceph-radosgw"Jenkins1-0/+1
2016-02-25Import module rather than funciton in the set_configs.py fileJeffrey Zhang1-2/+2
TrivialFix Change-Id: I352ef1176407edf093667644ce6adbd48eb63865
2016-02-25Pin ceph-radosgwMartin André1-0/+1
Change-Id: I9ff2e9d1e682f3d6b206568863d4bac3900fc03a Closes-Bug: #1549538
2016-02-24Merge "Add manila_sudoers file"Jenkins2-0/+5
2016-02-24Merge "Switch ceph to use storage network"Jenkins1-3/+3
generated by cgit v1.2.3 (git 2.39.1) at 2026-11-05 23:22:12 +0000