summaryrefslogtreecommitdiffstats
path: root/puppet
AgeCommit message (Collapse)AuthorFilesLines
2016-09-12Merge "Fix service config files having wrong map_merge format"Jenkins3-3/+3
2016-09-12Merge "Make Nova VNC Proxy service name match service net map"Jenkins2-3/+3
2016-09-10Merge "Adjust MTU to compensate for VLAN tag issue"Jenkins1-2/+5
2016-09-10Make Nova VNC Proxy service name match service net mapJuan Antonio Osorio Robles2-3/+3
If these names don't match then we cannot set the service's nodes, VIP and network. Change-Id: I8f1c0eaf62eee2704a5f2556a553032106db606b Closes-Bug: #1621368
2016-09-10Merge "Add support for configuring the OVS firewall driver"Jenkins1-0/+9
2016-09-09Merge "add composable services for Contrail"Jenkins6-0/+436
2016-09-09Adjust MTU to compensate for VLAN tag issueBrent Eagles1-2/+5
Some network configurations uncovered what appears to be an issue where a spurious 802.1q header is injected into tunnelled traffic. Adjusting the default value to accomodate the extra overhead should avoid this problem. Partial-Bug: #1621533 Change-Id: I9ebad2d6ad34d90fcb998497873059995cdef276
2016-09-09Merge "Generate VIP info for ctlplane VIP, not management"Jenkins2-5/+5
2016-09-09Merge "Move role deployment steps into puppet/post.yaml"Jenkins10-473/+796
2016-09-09Merge "Add keystone networks for the different endpoints"Jenkins1-0/+5
2016-09-09Move role deployment steps into puppet/post.yamlSteven Hardy10-473/+796
To enable steps to be aligned between roles, we need to define dependencies between the steps, which is only possible if we move the steps out of distinct nested stacks so we can use depends_on to serialized the steps for all roles. Note that we may be able to further refactor later to remove the per-role -config.yaml nested stacks as well. Change-Id: Ia2ea559e8eeb64763908f75705e3728ee90b5744 Partially-Implements: blueprint custom-roles
2016-09-09Merge "Add global_config_settings to services' output"Jenkins2-0/+7
2016-09-09Merge "Add service networks to hieradata"Jenkins1-0/+22
2016-09-09Generate VIP info for ctlplane VIP, not managementJuan Antonio Osorio Robles2-5/+5
The management network does not have a VIP, so it's been wrong to generate a cloud name and hieradata for this. Instead, the network that actually needs a name and a hosts entry is the ctlplane network, which actually has a VIP and there are services that use it. bp tls-via-certmonger Closes-Bug: #1621742 Change-Id: I163b2c7b5684da6dc290636f54eefe3f2b0c3e3f
2016-09-08Convert SwiftDevicesAndProxyConfig to composable formatSteven Hardy5-90/+19
Make use of the new composable per-service node_ips lists by adding a ServiceNetMap entry for SwiftStorage, then pass the data to construct the raw device list into puppet-tripleo instead of mangling it in t-h-t inside the role templates. This will allow running swift storage services on nodes other than the Controller and ObjectStorage roles, and is required to enable custom roles. Depends-On: I11deed1df712ecccf85d36a75b3bd2e9d226af36 Change-Id: I1bf5f8a9d34b1a5d64ab8656b386226b54ec1a27 Partially-Implements: blueprint custom-roles
2016-09-08Merge "Add base neutron service configuration"Jenkins1-8/+19
2016-09-08Add support for configuring the OVS firewall driverBrent Eagles1-0/+9
This patch introduces a parameter to allow customizing the Neutron OpenvSwitch agent's firewall driver configuration. Closes-Bug: 1618507 Change-Id: I595c392f7a1afe2164bf562224d9eda9b3dfa982
2016-09-08Merge "Create entries for overcloud VIPs in /etc/hosts"Jenkins1-0/+56
2016-09-08Add keystone networks for the different endpointsJuan Antonio Osorio Robles1-0/+5
Keystone doesn't provide different flags to indicate that both of its endpoints are enabled. So currently we have to manually add its network to all-nodes-config. bp tls-via-certmogner Change-Id: Ibecd78706e84853107f698ba411a0c05e6f5be52
2016-09-07Merge "OVN heat templates"Jenkins2-0/+124
2016-09-07Fix service config files having wrong map_merge formatSaravanan KR3-3/+3
map_merge in heat templates should start with hypen for each map group, few templates are missing the hypen for the second map group, which is added in this patch Closes-Bug: #1621008 Change-Id: I307fdd7afc374cce46d6e378594f1b688b9fd4f6
2016-09-07Add base neutron service configurationBrent Eagles1-8/+19
Include the neutron-base service definition to align pull in common configurations. This might not be *absolutely* necessary as any required common configuration would likely already be added by and OVS agent service, etc. but it's better to be safe than sorry and it does keep things consistent across the Neutron services. Implements: blueprint tripleo-sriov Change-Id: I10a9d9b29760475e6cd75e4057051c75a52ffbb7
2016-09-07Create entries for overcloud VIPs in /etc/hostsJuan Antonio Osorio Robles1-0/+56
This will aid us in using FQDNs instead of IPs if DNS is not set. If the deployer already has DNS set up, they can easily disable this profile by adding the use-dns-for-vips.yaml environment file. bp tls-via-certmonger Change-Id: I8c1b3f253d0149d575171c208f9a1342a7b26450 Depends-On: I1bdb2701dfb3e7ef072e674c9882d3be5af7296c
2016-09-07Add VIP names to allNodesConfigJuan Antonio Osorio Robles1-0/+15
The nodes need to be aware of the fqdn's for the specific endpoints in the cloud. This could be either to set the entries in /etc/hosts or to select an appropriate hostname for a certificate to be generated. bp tls-via-certmonger Change-Id: I9b4645b937a344f46ec18a9a68c5afa2bc5206d0
2016-09-07Add bootstrap_node and vip_data to hierarchy for all rolesSteven Hardy5-1/+9
We recently made changes that add data to allNodesConfig, but we didn't wire the files into the hierarchy on all roles. Change-Id: I8e838b02bd982e600af54b14350106322244890a Closes-Bug: #1620485
2016-09-07Merge "Fix aodh auth url to remove suffix"Jenkins1-1/+1
2016-09-07Merge "Use Redis VIP when deploying with keepalived"Jenkins1-0/+1
2016-09-07Merge "Set Redis VIP on all nodes"Jenkins2-6/+4
2016-09-06Merge "Change NeutronWorkers default to result in previous behavior"Jenkins1-3/+11
2016-09-06Merge "Cleanup haproxy service from explicit services enablement"Jenkins2-23/+0
2016-09-06Fix aodh auth url to remove suffixPradeep Kilambi1-1/+1
puppet aodh auth type defaults to password type and v2 auth_url doesnt work with domain. This fixes the url to not include suffix. Change-Id: I46d53e748d8932ed1183bedbdeb5eefcde679f9e
2016-09-06Use Redis VIP when deploying with keepalivedJiri Stransky1-0/+1
Previously we weren't creating Redis VIP in keepalived, causing Redis to be unusable in non-HA deployments. This is now fixed. Depends-On: I0bb37f6fb3eed022288b2dcfc7a88e8ff88a7ace Change-Id: I0ecfda1e6ad5567f6f58d60bf418bc91761833ab Closes-Bug: #1618510
2016-09-06Set Redis VIP on all nodesJiri Stransky2-6/+4
Move Redis VIP from controller-only to all nodes so that we don't assume where Redis is deployed. Change-Id: I55f8d48e3e077951fbcc88158dd6f21a2fe5f457 Related-Bug: #1618510 Partially-Implements: blueprint custom-roles
2016-09-06Add service networks to hieradataJuan Antonio Osorio Robles1-0/+22
This adds a mapping of which service is on which network. This information can be used to fetch a certificate depending on the network (since they use different hostnames). Change-Id: I176245da591bea28aeabf3d2b552f24456c98c43
2016-09-06Merge "Move VIP-related data to AllNodesConfig"Jenkins3-74/+52
2016-09-05add composable services for Contrailmichaelhenkel6-0/+436
- Config - Control - Analytics - Database - Webui For puppet modules see https://review.openstack.org/#/c/348905 Implements: blueprint contrail-services Depends-On: I8de63b6e21f8fdf3c2fd13bf5475cce4a85311d6 Change-Id: I7325b4268c4bec5eb7b777ea2a0639d7a8553e93
2016-09-05Merge "Ironic: update default enabled drivers"Jenkins1-1/+1
2016-09-05Merge "Ironic: configure disk erasing during cleaning"Jenkins1-0/+7
2016-09-05Merge "Ironic: enable iPXE by default and make it configurable"Jenkins1-0/+23
2016-09-05Merge "Add default for DeployIdentifier in nested templates"Jenkins6-0/+6
2016-09-05Move VIP-related data to AllNodesConfigJuan Antonio Osorio Robles3-74/+52
This makes it easier to access the VIP data for other node types and de-ties this from the controller role. Change-Id: I71125576ec93889fed134b92fb59f7e7dc9920c4
2016-09-04Ironic: update default enabled driversDmitry Tantsur1-1/+1
The goal is to have only production drivers available out of box. Remove agent_ipmitool as it required additional configuration of swift temporary URLs. Add pxe_ilo and pxe_drac as they work out of box. This brings the default enabled drivers list closer to one of undercloud. Note that pxe_ssh is not enabled as it's not a production driver. Change-Id: Ic7d2190e2d39a795b024c2999e22ee47b3045cf1 Partially-Implements: blueprint ironic-integration
2016-09-03Remove mangling swift memcached list (now in puppet-tripleo)Steven Hardy2-24/+0
Moved this list manipulation to puppet-tripleo where it can easily reference the memcached_node_ips array instead of hard-coded output from the Controller. Depends-On: Ic8872e5e51732874ca5b93bff5efd3e7ed75bc31 Change-Id: I523a802c8d22be7602728ebe8966d9e2ee109cde Partially-Implements: blueprint custom-roles
2016-09-03Composable per-service VIP hieradataSteven Hardy1-39/+54
Change-Id: Iaf78a5eac223aeb50133fcc6fab043ee746d73fd Partially-Implements: blueprint custom-roles
2016-09-03Remove hard-coded per-service rabbitmq hieradataSteven Hardy1-23/+0
To avoid the hard-coded references which won't work with composable roles, we instead default to the rabbitmq_node_ips list in the per-service puppet-tripleo profiles. Change-Id: I76b7e06781fdd5d969503b6d73423bb3f5f7a41f Depends-On: Ie53c93456529420588eb1927703ea91b54095d87 Partially-Implements: blueprint custom-roles
2016-09-03Merge "Generate composable service node_names lists"Jenkins1-10/+3
2016-09-03Merge "Mv pacemaker and firewall out of controller"Jenkins3-76/+67
2016-09-02Mv pacemaker and firewall out of controllerDan Prince3-76/+67
This patch moves settings for pacemaker and the tripleo firewall out of controller.yaml. Related bug: #1604414 Change-Id: I0164717bfd79cdea3de8eb7a64771028bea201ac
2016-09-02Merge "Ironic: enabled_services moved from ironic to ironic::conductor manifest"Jenkins1-1/+1
2016-09-02Merge "Move snmp settings into composable services"Jenkins3-17/+2