aboutsummaryrefslogtreecommitdiffstats
path: root/puppet
AgeCommit message (Collapse)AuthorFilesLines
2015-09-22Remove default_floating_pool in compute.yamlJames Slagle1-1/+0
This is unused on compute nodes and does not need to be specified. Further, nova::api is not even included in the compute puppet manifest, so it had no effect anyway. Change-Id: I7589bf544fb1ddad3cd371869756cb880c0bac37
2015-09-22Pass default_floating_pool into nova::api classDerek Higgins2-7/+3
We were calling nova_config resource to define it but as of Ic060fc18c8f5d7dc8fcf1d7bd921623dc505a515 its now included as part of the nova::api class. Closes-bug: #1498237 Change-Id: I948f26304536e2d692acf38d994d29167672168b Depends-On: I2789e782a4fd673e09c6334b6d56819c68414c80
2015-09-21Merge "Configure ctlplane network with a static IP"Jenkins5-0/+5
2015-09-17Configure ctlplane network with a static IPDan Prince5-0/+5
This patch updates all network configuration templates so that we configure the ctlplane network interface with a static IP instead of using DHCP. The IP address used for the static IP is passed into each nested stack network configuration template via the ControlPlaneIp parameter. Three new nested stack parameters called ControlPlaneSubnetCidr, ControlPlaneDefaultRoute, and EC2MetadataIp have been added to help configure the CIDR, default route, and EC2 metadata route on the ctlplane statically. These parameters can be customized via the parameter_defaults section in the heat environment. A single new template called net-config-static-bridge.yaml has been added to help migrate towards using the static configuration templates when not using network isolation. Depends-On: I257e1cba6dee16f73f75512d1284e1e3b9d4c831 Change-Id: Ib267e6dcf2d5ff77f7a82ee20a123965c2d07565
2015-09-17Support new form of servers config for ML2 cisco nexus allnodes config.tiswanso1-2/+1
The puppet-neutron changes to remove the usage of ERB templates require changing the format of the 'servers' hash/dictionary to include a key for use with puppet's create_resources directly from hiera data. Depends-On: I401371c9e5176de7ce19d4d4e878e9f2e69aab80 Change-Id: I950b7fb019dd8dd072592618b968a19df5c9c884
2015-09-17Port Cisco Nexus/UCSM ExtraConfig to AllNodesSteven Hardy2-141/+326
Switch the implemention from a pre_deploy ExtraConfig to an AllNodesExtraConfig, so we can collect the mac->hostname mapping for all nodes, then calculate a NexusConfig based on that and a provided mapping of switch ports to mac address. The same conversion is also done to the NetworkUCSMHostList: The port mappings are provided via parameter_defaults like: parameter_defaults: NetworkNexusConfig: { "bxb-tor-1": { "username": "admin", "ssh_port": 22, "password": "lab", "ip_address": "10.86.7.204", "nve_src_intf": 0, "physnet": "datacentre", "servers": { "fa:16:3e:fa:be:ef": "1/11", "fa:16:3e:fa:5e:cf": "1/23", "fa:16:3e:fa:12:34": "2/34" } } } NetworkUCSMHostList: 'fa:16:3e:fa:be:ef:profile1' This results in an entry like this appended to /etc/puppet/hieradata/neutron_cisco_data.yaml: neutron::plugins::ml2::cisco::nexus::nexus_config:\ {"bxb-tor-1": {"username": "admin", "nve_src_intf": 0, "ssh_port": 22, "servers": {"overcloud-compute02": "2/34", "overcloud-compute01": "1/23", "overcloud-control01": "1/11"}, "password": "lab", "ip_address": "10.86.7.204", "physnet": "datacentre"}} neutron::plugins::ml2::cisco::ucsm::ucsm_host_list: overcloud-control01:profile1 Co-Authored-By: Rob Pothier <rpothier@cisco.com> Co-Authored-By: Tim Swanson <tiswanso@cisco.com> Change-Id: I372c3ffb6bd85b7239fcb9f3fc4fa51cd4a39332
2015-09-17Merge "Big Switch Neutron ML2 plugin integration"Jenkins4-0/+94
2015-09-16Merge "Set pacemaker default resource-stickiness"Jenkins2-0/+4
2015-09-16Big Switch Neutron ML2 plugin integrationJiri Stransky4-0/+94
Add support for Big Switch Neutron ML2 plugin. Makes sure that the package is present and sets up the [restproxy] section in ml2_conf.ini. This also adds support for setting the ovs_use_veth option in l3_agent.ini. There is no support for this in puppet-neutron l3 class and it probably doesn't make sense adding it there, because this setting isn't relevant for all l3 agent drivers, it's specific to OVSInterfaceDriver. The ovs_use_veth option is also added to dhcp_agent.ini. Change-Id: I99635e25b2099dacce68154fe14693d6f06ac19f
2015-09-16Merge "Enable Cisco Nexus and UCSM plugins"Jenkins4-0/+158
2015-09-16Merge "Add 4 pacemaker constraints for keystone"Jenkins1-0/+37
2015-09-15Merge "Ensure mysql root can only connect from localhost"Jenkins1-0/+1
2015-09-15Enable Cisco Nexus and UCSM pluginsRobert Pothier4-0/+158
This enables support for the Cisco UCS Manager and Cisco Nexus plugins Change-Id: I1bc28a4768d5d6857a0504ca1f77dd71259570b8
2015-09-15Merge "switch to vxlan by default"Jenkins2-4/+4
2015-09-15Merge "Consume the NeutronMechanismDrivers from the hiera data"Jenkins2-0/+2
2015-09-10Merge "Set the nova scheduler ram_allocation_ration to 1.0"Jenkins3-0/+3
2015-09-09Merge "Don't add 'host' parameter to cinder.conf"Jenkins2-8/+0
2015-09-08Merge "Add NodeAdminUserData interface for "heat-admin" user"Jenkins5-5/+90
2015-09-07Don't add 'host' parameter to cinder.confDerek Higgins2-8/+0
As of I54a75652efd5e91464b84adf84004400b343c3a5 for rdb this is being done by the cinder puppet module. Change-Id: I109e139fcbb859a0d9ed99054656be94975d33b5
2015-09-05Keystone network isolation fixesDan Prince2-5/+11
This patch adds explicit nested stack parameters to help manage use of the Keystone Admin API vs. the Keystone Public API. We also add a new output parameter specifically for the Keystone admin API VIP. This can be useful when configuring keystone endpoints with network isolation. Change-Id: I2bd3e61570151e2faeee14ee09b03ad0b3208cc1
2015-09-05Merge "Support for using external Ceph clusters"Jenkins4-10/+102
2015-09-05Allow 'ctlplane' to be used within Net IP MapsDan Prince5-13/+20
When using network isolation you might want to selective move one of the services back to the default ctlplane network by simply using the ServiceNetMap parameter. This patch adds ctlplane to the output parameters for both the net_ip_map and net_ip_list_map nested stacks so that this is possible. As part of this patch we also split out the NetIpSubnetMap into its own unique nested stack so that the Heat input parameters for this stack are more clearly named. Change-Id: Iaa2dcaebeac896404e87ec0c635688b2a59a9e0f
2015-09-03Add NodeAdminUserData interface for "heat-admin" userSteven Hardy5-5/+90
Reinstates the heat-admin user via template user-data, which replaces the previous boothook injected user provided by the (deprecated now removed) heat instance_user option. This has some advantages over the heat.conf option, e.g it allows for much easier customzation of the user configuration (additional SSH keys, adding groups etc), and also in future if we support deploying more than one overcloud you could specify a different user per deployment. Co-Authored-By: Dan Prince <dprince@redhat.com> Change-Id: I2235b9690c01542d8a28ec1c1a4607de751aea29 Closes-Bug: #1229849
2015-09-02Add redis ordering with ceilometer-centralJiri Stransky1-0/+16
This is another missing constraint. The `require-all=false` part is good to have, otherwise Ceilometer (and transitively Heat) would switch to A/P mode. However, at the moment `require-all=false` isn't a recognized parameter on Fedora, hence the logic fork based on $::operatingsystem. Change-Id: I2657087192a05b2d8f0ab04ec60631d35331bf6c
2015-09-02Set pacemaker default resource-stickinessJiri Stransky2-0/+4
This is required for HA to work correctly. Change-Id: I9faa8fd7bbbac67de5c468ab6fc4edb2260dffe7 Depends-On: https://github.com/redhat-openstack/puppet-pacemaker/pull/61
2015-09-02Re-add constranits between nova-api and nova-novncproxyJiri Stransky1-18/+16
This can probably only be merged when we move CI forward from Fedora 21 to Fedora 22. Change-Id: I3a3db4b179cc19756f75003dacd2bb4cd957f0de
2015-09-02Set the nova scheduler ram_allocation_ration to 1.0Emilien Macchi3-0/+3
We don't have swap space enabled on overcloud-full deploys as discussed at https://bugs.launchpad.net/tripleo/+bug/1491335 The default is 1.5 so configure Virtual ram to physical ram allocation ratio to 1:1 so we don't allow overcommit. Related-Bug: 1491335 Change-Id: I58cfe6dc68e8615a5519428412dec8c653bd6093
2015-08-31Merge "Enable Keystone notifications"Jenkins3-0/+20
2015-08-31Add 4 pacemaker constraints for keystoneJiri Stransky1-0/+37
These were missing and are required for a correct deployment. Change-Id: I49a61d0ab2f750f2620927a40f798d11b241b2c0
2015-08-25Consume the NeutronMechanismDrivers from the hiera datamarios2-0/+2
This is passed from the heat templates as hiera data (defaulting to 'openvswitch') but never effected, meaning we get the puppet module default. Change-Id: I3f14cdce9b9bf278aa9b107b2d313e1e82a20709 Closes-Bug: 1488176
2015-08-21switch to vxlan by defaultMike Burns2-4/+4
VXLAN has better performance (20-25% better) NICs with VXLAN offload are more common Change-Id: If57c79a1309ae178b3e82d54bb101dde584c86cc Related: rhbz#1244864
2015-08-18Merge "Wire in Compute pre-deployment extraconfig"Jenkins1-1/+12
2015-08-18Enable Keystone notificationsGiulio Fidente3-0/+20
This change enables Keystone notifications and adds two parameters to control the notification driver and format. Change-Id: I23ac3c46ee9eb49523d3b8dab027ef21fc6e42df
2015-08-13Support for using external Ceph clustersDan Prince4-10/+102
This patch adds support for using an externally managed Ceph cluster with the TripleO Heat templates. For an externally managed Ceph cluster we initially only deploy the Ceph client tools, install the 'openstack' user keyring, and generate the ceph.conf. This matches what we do for managed Ceph installations and is a good first start. No other Ceph related services are installed or managed. To enable use of a Ceph external cluster simply add the custom Heat environment file environments/puppet-ceph-external.yaml to your heat stack create/update command and make sure to set the required CephClientKey, CephExternalMonHost, and CephClusterFSID variables. Change-Id: I0a8b213ce9dfa2fc4e62ae1e7631466e5179fc2b
2015-08-06Merge "Drive DB initialization via Hiera"Jenkins4-102/+75
2015-08-04Ensure mysql root can only connect from localhostYanis Guenane1-0/+1
Currently mysql root user can connect in a passwordless way from : * localhost * 127.0.0.1 * ::1 * <HOSTNAME> This patch ensures that the mysql root user can connect only from localhost. Change-Id: If64fd383737c2fbeed4adbe8d98b1f92610956b2
2015-08-03Wire in Compute pre-deployment extraconfigShiva Prasad Rao1-1/+12
This commit provides a way to configure some additional hieradata for compute nodes. This is similar to the earlier added infra for supporting Controller pre-deployment extraconfig. Change-Id: I02dda0685c7df9013693db5eeacb2f47745d05b5
2015-07-28Merge "Keystone token flushing"Jenkins3-0/+9
2015-07-24Merge "Set rabbitmq heatbeat timeout threshold to 60"Jenkins1-0/+6
2015-07-24Merge "Ensure SELinux is permissive on Ceph OSDs"Jenkins4-2/+46
2015-07-24Merge "Set heat::instance_user to empty string"Jenkins2-1/+1
2015-07-24Keystone token flushingJiri Stransky3-0/+9
Set up a cron job to flush keystone tokens periodically. The job runs once a day near midnight per puppet-keystone defaults, and we pass maxdelay 3600 which means each controller will wait a random delay of up to 1 hour before running the task. Change-Id: I351f0273c61106c182aa3945b7ad1ce8f5c7d12b
2015-07-24Merge "NFS backend for Cinder"Jenkins5-2/+84
2015-07-24Merge "Use 'public' instead of 'nova' as default floating pool name"Jenkins4-0/+9
2015-07-23Merge "Wire in hieradata overrides via ExtraConfig for CephStorage"Jenkins1-0/+18
2015-07-23Merge "Wire in hieradata overrides via ExtraConfig for ObjectStorage"Jenkins1-0/+18
2015-07-23Use 'public' instead of 'nova' as default floating pool nameGiulio Fidente4-0/+9
The dafault in nova.conf for default_floating_pool is set to nova which is confusing given to make Tempest tests to pass one has to create a public network with such a name. Change-Id: I148222a9f276309ede062ee5292993898ff899d6
2015-07-23Merge "Provide list of memcached servers to Nova"Jenkins2-2/+6
2015-07-22Merge "Wire in hieradata overrides via ExtraConfig for BlockStorage"Jenkins1-34/+13
2015-07-22Merge "Wire in hieradata overrides via ExtraConfig for NovaCompute"Jenkins1-34/+8