aboutsummaryrefslogtreecommitdiffstats
path: root/environments
AgeCommit message (Collapse)AuthorFilesLines
2015-11-10Merge "Allow customization of the Ceph pool names"Jenkins1-1/+6
2015-11-10Change the Atomic image name so it's less specificRyan Hallisey1-1/+1
The atomic image name in glance was being set to 'fedora-atomic'. The glance image can be any form of atomic distro so we shouldn't name this specifically 'fedora-atomic', but instead 'atomic-image'. Change-Id: Ic539b82b92e3fdd834750e591d8622b7dc85fc6d
2015-11-05Allow customization of the Ceph pool namesGiulio Fidente1-1/+6
This is useful in those scenarios were we want to use an external Ceph deployment with multiple overclouds. Change-Id: I1749d2a6547f6ce25843709e46a1447e8d42cfff
2015-11-05Merge "Add network templates for multiple NIC configuration"Jenkins1-0/+13
2015-11-05Add network templates for multiple NIC configurationDan Sneddon1-0/+13
This change adds a set of network interface configurations for use with network isolation. The multiple-nics templates includes one separate NIC per network, and assumes that nic1 is used for the provisioning network (ctlplane). Also included is an environment file for including the multiple-nics configuration in a deployment. This revision changes the ordering of the NICs. By doing that, it is possible to wire up only a subset of the NICs for the storage nodes, and it is possilbe to leave the External NIC only configured on the controllers. rdo: Updated this commit for static control plane configuration Co-Authored-By: Rhys Oxenham <roxenham@redhat.com> Change-Id: Ic878d1ed1a85b5705295d087a743570ca8213504
2015-10-19Support NFS backend for Glance (via Pacemaker)Jiri Stransky1-1/+1
Adds support for NFS backend in Glance by allowing the storage directory for the 'file' backend to be a mount managed by Pacemaker. Default behavior is unchanged. Since the Pacemaker-related parameters are not exposed on top level, change storage-environment.yaml to use parameter_defaults instead of parameters. Depends on a Heat fix for environment file's parameter_defaults to work well with JSONs and comma delimited lists (see Depends-On). Change-Id: I6e7e2eaf6919b955650c0b32e1629a4067602c89 Depends-On: I85b13a79dbc97a77e20c0d5df8eaf05b3000815e
2015-10-12Merge "Allow enabling debug mode for config management (Puppet)"Jenkins1-0/+5
2015-10-08Docker compute role configured via PuppetDan Prince1-0/+17
This change adds a containerized version of the overcloud compute node for TripleO. Configuration files are generated via OpenStack Puppet modules which are then used to externally configure kolla containers for each OpenStack service. See the README-containers.md file for more information on how to set this up. This uses AtomicOS as a base operating system and requires that we bootstrap the image with a container which contains the required os-collect-config agent hooks to support running puppet, shell scripts, and docker compose. Change-Id: Ic8331f52b20a041803a9d74cdf0eb81266d4e03c Co-Authored-By: Ian Main <imain@redhat.com> Co-Authored-By: Ryan Hallisey <rhallise@redhat.com>
2015-09-30Allow enabling debug mode for config management (Puppet)Jiri Stransky1-0/+5
Also adds an environment file which can be passed to heat stack-create to enable debugging. Change-Id: I9758e2ca3de6a0bed6d20c37ea19e48f47220721 Depends-On: Ie92d1714a8d7e59d347474039be999bd3a2b542f
2015-09-30Enable Cisco N1KV driverShiva Prasad Rao1-0/+11
This enables support for the Cisco N1kv driver for the ML2 plugin. It also configures the Nexus 1000v switch. Co-Authored-By: Steven Hillman <sthillma@cisco.com> Depends-On: I02dda0685c7df9013693db5eeacb2f47745d05b5 Depends-On: I3f14cdce9b9bf278aa9b107b2d313e1e82a20709 Change-Id: Idf23ed11a53509c00aa5fea4c87a515f42ad744f
2015-09-22Rename -puppet.yaml templates.Dan Prince1-1/+1
Updates the /puppet directory templates so that we drop the '-puppet' from the filenames. This is redundant because we already have puppet in the directory name and fixes inconsistencies where we aren't using -puppet in all the files within the puppet directory. Depends-On: I71cb07b2f5305aaf9c43ab175cca976e844b8175 Change-Id: I70d6e048a566666f5d6e5c2407f8a6b4fd9f6f87
2015-09-17Port Cisco Nexus/UCSM ExtraConfig to AllNodesSteven Hardy1-3/+2
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-16Big Switch Neutron ML2 plugin integrationJiri Stransky1-0/+17
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"Jenkins1-0/+26
2015-09-15Enable Cisco Nexus and UCSM pluginsRobert Pothier1-0/+26
This enables support for the Cisco UCS Manager and Cisco Nexus plugins Change-Id: I1bc28a4768d5d6857a0504ca1f77dd71259570b8
2015-08-13Support for using external Ceph clustersDan Prince1-0/+18
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-07-30Provide a sample storage environment fileJiri Stransky1-0/+57
Meant to help users configure their storage parameters by copying this file out, amending it and passing it to `heat stack-create` or `openstack overcloud deploy`. Defaults to using Ceph as a backend for Cinder, Glance and also Nova ephemeral storage. Change-Id: Ia8f5ef175439394aacdea98cfd66416bcb9bfe3a
2015-07-21Merge "Fix Puppet Configuring NetApp Cinder Backend"Jenkins1-1/+1
2015-07-20Fix Puppet Configuring NetApp Cinder BackendRyan Hefner1-1/+1
It was incorrectly assumed that Puppet variables assigned to a defined class (as seen in cinder-netapp.yaml) would be applied to any resources created with that type. This is not how Puppet works. The full range of configuration parameters to cinder::backend::netapp have been added back in. They are still pulling from Hiera like they were intended before, but it needs to be a little more explicit for Puppet to be happy. Change-Id: I2e00eae829713b2dbb1e4a5f296b6d08d0c21100
2015-07-19Merge "Use parameter_defaults in env files"Jenkins2-2/+10
2015-07-13Allow a user to disable MongoDB journalingYanis Guenane1-0/+5
By default MongoDB enables a journaling system that prevents loss of data in case of an unexpected shut-down. When journaling is enabled, MongoDB will create the journal files before actually starting the daemon[1]. The journaling feature is useful in production environment, but not really on a CI-like system, where we only want to make sure MongoDB is setup correctly and running, hence here we allow a user to enable/disable MongoDB journaling. [1] http://docs.mongodb.org/manual/core/journaling/ Change-Id: I0e4e65af9f650c10fdf5155ff709b4eb984cf4e1 Closes-bug: #1468246
2015-07-09Use parameter_defaults in env filesJames Slagle2-2/+10
Switch to using parameter_defaults in environment files instead of a parameters section. Using a parameters section to set top level parameters breaks Tuskar based deployments because Tuskar prefixes the name of the top level parameters with a role name and version, thus changing the name of the parameter. When the environment file is then used to set a top level parameter, Heat fails with an error during template validation: ERROR: The Parameter (NeutronExternalNetworkBridge) was not defined in template Change-Id: I605651a8ebdbd0b2baf7bcea198c2988efb55f31
2015-07-08Merge "Add NeutronExternalNetworkBridge parameter"Jenkins2-0/+12
2015-07-06Add NeutronExternalNetworkBridge parameterDan Prince2-0/+12
This patch adds a new parameter to configure the neutron external network bridge. This setting applies to the bridge used in the Neutron l3_agent.ini file and can by useful if you wish to set external_network_bridge = '' in that file. As part of this fix we also update the environment file for network isolation so that we automatically set the new NeutronExternalNetworkBridge to an empty string. This fixes an issue where overcloud floating IPs did not work correctly when using the external network interface for floating IP traffic. Change-Id: I3bfcda8746780ea0851d88ed6db8557e261cef0d
2015-07-06Wire in Controller pre-deployment extraconfigSteven Hardy1-26/+25
The recently added cinder-netapp extraconfig contains some additional hieradata which needs to be applied during the initial pre-deployment phase, e.g in controller-puppet.yaml (before the manifests are applied) so wire in a new OS::TripleO::ControllerExtraConfigPre provider resource which allows passing in a nested stack (empty by default) which contains any required "pre deployment" extraconfig, such as applying this hieradata. Some changes were required to the cinder-netapp extraconfig and environment such that now the hieradata is actually applied, and the parameter_defaults specified will be correctly mapped into the StructuredDeployment. Change-Id: I8838a71db9447466cc84283b0b257bdb70353ffd
2015-07-01Merge "Include Redis VIP in example environment"Jenkins1-0/+3
2015-06-25Include Redis VIP in example environmentDan Sneddon1-0/+3
The network isolation code in the TripleO Heat templates has files in the environment folder that can be included to enable network isolation. This updates the environment file to include the VIP for Redis. Change-Id: Ic05720c565d9ecf76bf7485b969cb2d9ead9fd6f
2015-06-18Enable loadbalancing of the Redis VIP, defaults to Falsemarios1-3/+0
We have to set it to true as the default is false which means the redis vip can't be reached. This was manifested as a problem with ceilometer agent reaching the coordination url like [1]. Co-Authored-By: Giulio Fidente <gfidente@redhat.com> [1] https://bugzilla.redhat.com/attachment.cgi?id=1040023 Closes-Bug: https://bugzilla.redhat.com/show_bug.cgi?id=1232797 Change-Id: I1cd63308d0ac1d17542e1a2a909ee1a9680ed4b3
2015-06-09Merge "Add Redis as a Pacemaker resource"Jenkins1-0/+3
2015-06-08Merge "Enable NetApp Backends in Cinder"Jenkins1-0/+30
2015-06-05Add Redis as a Pacemaker resourceYanis Guenane1-0/+3
Change-Id: I731b408f24da01c1bc897bfffe8fd4d5638932ed
2015-06-05Enable NetApp Backends in CinderRyan Hefner1-0/+30
Enables support for configuring Cinder with a NetApp backend. This change adds all relevant parameters for: - Clustered Data ONTAP (NFS, iSCSI, FC) - Data ONTAP 7-Mode (NFS, iSCSI, FC) - E-Series (iSCSI) Change-Id: If6c6e511ef2d26c4794e3b37c61e5318485ff4db
2015-06-05Wire Neutron VLAN ranges param as array to puppetGiulio Fidente1-0/+4
Turns NeutronNetworkVLANRanges into a list and makes it consumable by neutron::plugins::ml2::network_vlan_ranges as an array. Previously usage of vlans was impossible due to puppet-neutron failing to join() network_vlan_ranges. Also fixes wiring of network_vlan_ranges on computes and adds a sample environment file to test use of vlans for tenant networks. Change-Id: I8725cdb9591dd8d0b7125fdacbefdc9138703266
2015-06-01os-net-config templates to configure vlansDan Prince1-0/+13
This patch adds 5 new role templates to help configure a vlans on top for each of the overcloud roles. This patch adds vlans on top of a single NIC attached to the control plane network (already used for provisioning). The patch also includes an environment file to enable configuration of vlans by simply sourcing this file. Change-Id: Ibc40e452dec9b372ff10442aab2bddaf382b0a2f
2015-05-26Merge "os-net-config templates to configure vlans on bond"Jenkins1-0/+13
2015-05-26Merge "overcloud stepped deployment environment"Jenkins1-0/+10
2015-05-26os-net-config templates to configure vlans on bondDan Prince1-0/+13
This patch adds 5 new role templates to help configure an OVS bond with vlans on top for each of the overcloud roles. These are meant to represent a more production network which might use isolated nets, and should help facilitate create a CI job which configures a bond w/ vlans on it. The patch also includes an environment file to enable configuration of bonded vlans by simply sourcing this file. Change-Id: Ibe4c9d933445014ce3bec5fb3d7e3139fc40cb32
2015-05-26An environment file to enable network isolationDan Prince1-0/+35
This commit adds an environment file which adds all the relevant resource registry entries to enable isolated overcloud networks. Change-Id: I8c5e0ca300b86a38925f59c9df7831d69da9f787
2015-05-22overcloud stepped deployment environmentSteven Hardy1-0/+10
When combined with --with-steps added to devtest_overcloud: https://review.openstack.org/#/c/162109/ this enables stepped deployments using heat hooks. This environment file will break on all *StepN resources in every *NodesPostDeployment resource, on both create and update. Change-Id: Ibab567f0a37b832ea2b5966288ad55b5682c31ab
2015-05-15Environment which configures puppet pacemaker.Dan Prince1-0/+4
Change-Id: I314955708ff99a557da5a6d223b1f56bd51855d9
2015-05-15Add a directory for overcloud heat environmentsDan Prince2-0/+29
This patch adds a new directory called environments which contains custom Heat environment files that can be used to enable custom overcloud features. As an initial example a puppet-ceph-devel.yaml environment has been added which can be used to spin up a small Ceph cluster for dev/testing. This directory may be useful for collecting other feature related Heat environment settings in the future as well. Things like isolated network settings, etc. Change-Id: Ia6998ae05d2363384d2a616a31d5795c8b2d85d5