summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2017-07-14Improve logs from ansible, puppet, docker-puppet.pyBogdan Dobrelya2-18/+63
* Debug ansible 'puppet apply' stderr joined stdout, split by lines. * Do 'puppet apply' w/o colors, logdest syslog, and given a wanted modulepath instead of the module puppet, that can't support those options. * Bind-mount syslog socket for docker-puppet.py to pass puppet logs to host OS syslog. * Fix logging handlers for multiprocess workers in docker-puppet.py. Related-bug: #1698172 Closes-bug: #1700086 Change-Id: I84112a836e968aa5c3596a6544e0392980529963 Signed-off-by: Bogdan Dobrelya <bdobreli@redhat.com>
2017-07-10Merge "Copy only generated puppet files into the container"Jenkins72-214/+627
2017-07-10Merge "Modify generic role template to support custom networks"Jenkins2-123/+38
2017-07-10Copy only generated puppet files into the containerMartin André72-214/+627
This solves a problem with bind-mounts when the containers are holding files descriptors open. At the same time this makes the template more robust to puppet changes since new config files will be available in the containers without needing to update the templates. Partial-Bug: #1698323 Change-Id: Ia4ad6d77387e3dc354cd131c2f9756939fb8f736
2017-07-08Disable network validation in multinode jobsBen Nemec11-0/+73
Sometimes the infracloud gateway refuses to ping even though everything else is working fine. Since we have coverage of this functionality in the OVB jobs it should be safe to turn it off here so it stops spuriously failing our jobs. We can't just set the resource to OS::Heat::None because there are other resources with dependencies on it. Instead, this adds a noop version of the validation software config that always returns true. Change-Id: I8361bc8be442b45c3ef6bdccdc53598fcb1d9540 Partial-Bug: 1680167
2017-07-08Merge "Add in roles data validation"Jenkins12-3/+152
2017-07-07Merge "Rename CongressApi to Congress (docker)"Jenkins3-7/+7
2017-07-07Merge "Create NIC templates for Neutron Networker composable role"Jenkins4-0/+645
2017-07-07Merge "Add sample usage of StorageMgmt network for compute nodes"Jenkins4-24/+39
2017-07-07Add in roles data validationAlex Schultz12-3/+152
With the merging of Iad3e9b215c6f21ba761c8360bb7ed531e34520e6 the roles_data.yaml should be generated with tripleoclient rather than edited. This change adds in a pep8 task to verify that the appropriate role files in roles/ have been modified to match how our default roles_data.yaml is constructed. Additionally this change adds a new tox target called 'genrolesdata' that will all you to automatically generate roles_data.yaml and roles_data_undercloud.yaml Change-Id: I5eb15443a131a122d1a4abf6fc15a3ac3e15941b Related-Blueprint: example-custom-role-environments
2017-07-07Rename CongressApi to Congress (docker)Emilien Macchi3-7/+7
Before it was Congress, let's stay consistent and stop using CongressApi in Docker service, because we release. Change-Id: Id939b3d70e185da4279f3860812fa5dce27d64dd
2017-07-06Merge "Enable Neutron LBaaS Integration"Jenkins8-0/+100
2017-07-05Merge "Update cinder-netapp-config environment"Jenkins1-0/+8
2017-07-05Merge "Fix typo in roles/Networker.yaml"Jenkins1-1/+1
2017-07-05Modify generic role template to support custom networksSteven Hardy2-123/+38
Render all per-network resources and interfaces via j2 to enable future support for custom networks via network_data.yaml Note this doesn't enable custom networks for the built-in roles as we skip j2 rendering for them, this will be resolved by converting them to use the generic role template instead of the hard-coded ones listed in the j2_excludes.yaml. Depends-On: I18fa3829ff38ac200550d8e36bbe334c0005da22 Change-Id: I49565f9389f3ec9aef4861e23a3bed64a85501e6 Partially-Implements: blueprint composable-networks
2017-07-05Merge "Adds docker OpenDaylight"Jenkins5-3/+138
2017-07-05Merge "Update NovaCompute to consume CephClientKey"Jenkins1-6/+9
2017-07-05Merge "Bind mount needed cert for haproxy"Jenkins1-0/+12
2017-07-05Merge "Allow volumes in puppet_config containers spec"Jenkins1-1/+1
2017-07-05Merge "Convert role templates to consume roles_data map"Jenkins2-101/+113
2017-07-05Merge "New environment file to configure containers."Jenkins1-0/+109
2017-07-04Merge "Updated from global requirements"Jenkins1-1/+1
2017-07-04Merge "Install ansible-pacemaker on O->P upgrade"Jenkins1-0/+2
2017-07-04Updated from global requirementsOpenStack Proposal Bot1-1/+1
Change-Id: I714ecad87a406bc237e3d4fdf88bc7e10555693c
2017-07-04Fix typo in roles/Networker.yamlSteven Hardy1-1/+1
The captialization mismatch here means the role currently doesn't work. Change-Id: Iced5004f993f8c100268361d87580d922e47f983
2017-07-04Enable Neutron LBaaS IntegrationRyan Hefner8-0/+100
Allows the configuration of the Neutron LBaaS agent. Implements: blueprint lbaasv2-service-integration Change-Id: Iae2bf7faeea93d5275994b2ee10f9bf863ed6152 Depends-On: Ieeb21fafd340fdfbaddbe7633946fe0f05c640c9
2017-07-04Convert role templates to consume roles_data mapSteven Hardy2-101/+113
Currently we only consume the name with a special-case for the disable constraints boolean, but it will be more flexible if we consume the whole roles_data mapping for each role, so that e.g composable networks and other per-role customizations can be expressed in these templates Partially-Implements: blueprint composable-networks Depends-On: Id1249b78b3dd87e91d572ffa31b7a541f3cde2c7 Change-Id: I355534ec456479944f66106e957404a660d8f2d2
2017-07-04Merge "Make ceilometer crontab removal idempotent"Jenkins1-0/+3
2017-07-03Adds docker OpenDaylightTim Rozet5-3/+138
Depends-On: I020550ede0ef981582392cf6c48dd5cb5823a074 Depends-On: I610b07a3c2bcf1c3288f76112a08b81c50e06913 Depends-On: I3d378044b3da5309b60967a12df7800520a254dc Depends-On: I9c32b41ef865a09587f3ebfe8b8a896031fbd285 Depends-On: Ib31bf29bc69f5c58e98b99c3e598b19c99efc77f Change-Id: I36c7390ddb4192e55ee56006fd6e9c5f8704445c Signed-off-by: Tim Rozet <trozet@redhat.com>
2017-07-03Update NovaCompute to consume CephClientKeyKeith Schincke1-6/+9
It is not necessary to get the Ceph key issueing a get-key to the Ceph cluster; this change provides the libvirt key via parameter instead. Change-Id: Iff3dbcb0f1b4d2373570e184e636a71553cea708
2017-07-03Merge "Add ServerIdMap output"Jenkins1-0/+18
2017-07-03Merge "adding --config-dir parameters to neutron containers"Jenkins4-4/+4
2017-07-02Merge "Move glance::api::show_multiple_locations within GlanceApi"Jenkins3-48/+13
2017-07-02adding --config-dir parameters to neutron containersOr Idgar4-4/+4
Change-Id: I521e89994e9be6efd335c5809810d9188dc1742f Closes-Bug: #1684908
2017-06-30New environment file to configure containers.Ian Main1-0/+109
This is part of a larger series that changes the interface used for configuring which containers are used. This needs CI and possibly quickstart updates to use this environment file so CI will continue to pass. Change-Id: I125137ba45f608cf84ea0a7146edd744a549d23b Co-Authored-By: Dan Prince <dprince@redhat.com>
2017-06-30Merge "Re-enable default for RoleParameters"Jenkins5-0/+5
2017-06-30Merge "Fix typo in config_volume"Jenkins1-2/+2
2017-06-30Merge "Make NovaWorkers descriptions consistent"Jenkins4-4/+4
2017-06-30Merge "cisco nexus: keep OVS on the Compute"Jenkins1-1/+0
2017-06-30Merge "Ensure boostrap_host_exec runs as root"Jenkins3-0/+20
2017-06-30Merge "scenario001: containerize services for CI"Jenkins1-5/+7
2017-06-30Merge "Add a docker-ha.yaml environment file for containerized HA deployments"Jenkins5-0/+26
2017-06-30Merge "Force mtime for tar used in container config md5sums"Jenkins1-1/+1
2017-06-30Merge "Add stack_name/ctlplane_service_ips into post-upgrade.j2.yaml"Jenkins1-2/+5
2017-06-30Ensure boostrap_host_exec runs as rootMartin André3-0/+20
This is necessary for accessing the bind mounted hieradata in the container in order to determine if the node is the primary node. With the new validation added to yaml-validate.py, we could spot potential issues in sahara-api and keystone bootstrap tasks. The keystone one is a false positive, as the image defaults to the root user in order to be able to run apache. Still, it is better to be consistent here and specify the root user nonetheless. Change-Id: Ib0ff9748d5406f507261e506c19b96750b10e846 Closes-Bug: #1697917
2017-06-30Fix typo in config_volumeSven Anderson1-2/+2
Change-Id: I6a53a56c534f24cb514d8aeb8cec3d7865b93448
2017-06-30Bind mount needed cert for haproxyMartin André1-0/+12
haproxy needs the deployed SSL cert file to function when TLS is enabled. It is also required for the docker-puppet haproxy container since the haproxy puppet module uses a validate_cmd to check the generated config file is valid that fails when the required SSL cert is not present. There is no clean way to disable this feature [1] so we need to bind mount the cert into the container. [1] https://github.com/puppetlabs/puppetlabs-haproxy/blob/4753ea5b2506ee093e9b4c8af6e91201d476d426/manifests/config.pp#L53-L57 Change-Id: Id2df144b678769def204961236624091d4e5c457
2017-06-30Allow volumes in puppet_config containers specJames Slagle1-1/+1
Mounting host volumes when running containers via puppet_config already works and is supported with docker-puppet.py. However, the validation in yaml-validate.py does not allow it. This patch makes it allowed by the validation. It is sometimes necessary since some puppet modules expect to make persistent file system changes other than just configuration data under /etc. In particular, ironic inspector expects to configure a http and tftp root director with an ipxe configuration. See: https://github.com/openstack/puppet-ironic/blob/master/manifests/inspector.pp These changes would be lost if the value for those directories are not mounted as host volumes. Change-Id: Ie51c653f4c666fbaaef0ea80990e2e61f4b1353b
2017-06-30Merge "Add missing xinetd/rsync container for Swift"Jenkins1-1/+21
2017-06-30Merge "Add detach to docker-toool"Jenkins1-6/+10