aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2016-09-08Merge "Create entries for overcloud VIPs in /etc/hosts"Jenkins4-0/+67
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"Jenkins4-0/+143
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 Robles4-0/+67
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 Robles2-0/+20
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"Jenkins3-7/+5
2016-09-06Merge "Change NeutronWorkers default to result in previous behavior"Jenkins1-3/+11
2016-09-06Merge "Update OpenContrail loadbalancer plugin value"Jenkins1-1/+1
2016-09-06Merge "Add constraint to prohibit balance-tcp from BondInterfaceOvsOptions"Jenkins8-3/+44
2016-09-06Merge "Add missing reference to ExternalPort for DVR"Jenkins1-0/+7
2016-09-06Update OpenContrail loadbalancer plugin valueEmilien Macchi1-1/+1
Update OpenContrail loadbalancer plugin value to match with Newton changes. Closes-Bug: #1620657 Change-Id: I48f1884b95e590c0588c52419ec152bd08bc3992
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 Stransky3-7/+5
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-06Merge "Added environment file for SR-IOV deployment"Jenkins1-0/+22
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"Jenkins5-105/+54
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 Robles5-105/+54
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 Hardy3-25/+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 Hardy2-59/+65
Change-Id: Iaf78a5eac223aeb50133fcc6fab043ee746d73fd Partially-Implements: blueprint custom-roles
2016-09-03Create NetIpListMap for all rolesSteven Hardy2-9/+93
This allows us to create $service_node_ips and $service_node_names hiera entries for services not deployed on the Controller role. Co-Authored-By: Thomas Herve <therve@redhat.com> Change-Id: I688618dda05ff908293c32b9d8518697d57e9eb0 Partially-Implements: blueprint custom-roles
2016-09-03Remove hard-coded per-service rabbitmq hieradataSteven Hardy2-24/+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"Jenkins3-11/+18
2016-09-03Merge "Set NeutronL3HA to false when deploying DVR"Jenkins1-0/+8
2016-09-03Merge "Mv pacemaker and firewall out of controller"Jenkins4-78/+67
2016-09-03Merge "Change CloudName default value to include domain"Jenkins1-1/+1
2016-09-02Merge "Drop overcloud-without-mergepy.yaml (again!)"Jenkins1-1038/+0
2016-09-02Mv pacemaker and firewall out of controllerDan Prince4-78/+67
This patch moves settings for pacemaker and the tripleo firewall out of controller.yaml. Related bug: #1604414 Change-Id: I0164717bfd79cdea3de8eb7a64771028bea201ac
2016-09-02Drop overcloud-without-mergepy.yaml (again!)Dan Prince1-1038/+0
This file was mistakenly re-added in 25ad7b8e1eeeb0e1f5f83b9f7560502717b44536. It is breaking subsequent refactoring and preventing us from landing the last few composable services patches. Change-Id: I41b951d769f4545ee8e30afdf40fe8c7638b4b12 Closes-bug: #1619786
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
2016-09-02Generate composable service node_names listsSteven Hardy3-11/+18
Some puppet interfaces require a comma separated list of hostnames where a service is running, so generate it in a similar way to th service ips. Change-Id: Icdf5d993d089dc94035194bdbd52299fcbc793be Partially-Implements: blueprint custom-roles
2016-09-02Merge "Remove repeated apache-related hieradata"Jenkins1-13/+0
2016-09-02Merge "Upgrade ceph-osd"Jenkins1-10/+67
2016-09-02Move snmp settings into composable servicesDan Prince3-17/+2
Provides snmp_readonly_user_* parameters to the base::snmp class and removes them from the role templates. Related-bug: #1604414 Co-Authored-By: Giulio Fidente <gfidente@redhat.com> Change-Id: I35b1ff23baff0c25e742562e1103a3882f7bf767
2016-09-02Ironic: configure disk erasing during cleaningDmitry Tantsur1-0/+7
Cleaning is run before the first and between every deployments to ensure that the node is in a clean state (hence its name). The most important part of it is wiping the hard drive. This change allows tuning this action. A new option IronicCleaningDiskErase accepts the following options: * full - for full cleaning with removing the data via ATA secure erase or shred * metadata - for cleaning only partitioning table. The third option "none" is suppored by Puppet but is not advertised here as disabling disk wiping completely is known to cause bugs. Note that the upstream Ironic default is a bit unfortunate: it enabled both processes. We set the default to "full" which has the same effect, but is faster. Change-Id: I46632f71f7ab63daac243acefa5166c58ca05da0 Partially-Implements: blueprint ironic-integration
2016-09-02Ironic: enable iPXE by default and make it configurableDmitry Tantsur1-0/+23
Introduce two new options: IronicIPXEEnabled (true by default) and IronicIPXEPort (8088 by default). Also copy UEFI configuration from instack-undercloud. Change-Id: I4e037c1ea9c8663efb4d472469d0d2640e265710 Depends-On: Icb9633134114041bbd497e7652482dd5d34c9327 Partially-Implements: blueprint ironic-integration
2016-09-02Ironic: enabled_services moved from ironic to ironic::conductor manifestDmitry Tantsur1-1/+1
Change-Id: I30003e4500ccf681121bca7f0a8ffddb05f61660 Partially-Implements: blueprint ironic-integration