aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2016-12-06Fix SwiftStorage role.Chris Jones1-2/+2
We now fetch the name argument from the correctly named SwiftStorage object. Change-Id: I885505eadfc778ab57793c97af4d1c6739ec9614 Closes-Bug: #1647716
2016-12-05Merge "Support multiple meter dispatchers in ceilometer config"Jenkins1-3/+3
2016-12-05Merge "Move nodes' fqdns to a map to remove clutter"Jenkins6-679/+660
2016-12-05Merge "Use transient hostname for deployed servers"Jenkins1-17/+2
2016-12-05Merge "Fix bug when using multiple DeployArtifactURLs"Jenkins1-1/+1
2016-12-02Merge "No longer hard coding to a specifc network interface name."Jenkins1-2/+2
2016-12-02Add NIC config for compute role for DVR with multiple NICsDan Sneddon1-0/+162
This change adds a NIC config to the multiple-nics sample NIC config templates for a compute node running DVR. In order for DVR to work on the compute nodes, they must share an external bridge with the controllers. All of the other sample NIC configs already have an external bridge (defaults to 'br-ex'), but the multiple-nics compute role does not, so now the compute-dvr.yaml NIC template will demonstrate DVR with multiple NICs. Change-Id: I80fe2e5842a67984e1d4d8aa295c7607c4f340ad
2016-12-02Merge "Revert "Use FQDN for rabbitmq's nodename env variable""Jenkins1-7/+1
2016-12-02Merge "Add zaqar to the controller's list of services in roles_data.yaml"Jenkins1-0/+1
2016-12-02Fix bug when using multiple DeployArtifactURLsChristian Schwede1-1/+1
The script tries to download all artifact URLs with a single request, instead of downloading each URL on its own if multiple DeployArtifactURLs were given. Change-Id: I6a8be699aff7023a67702bb1d3ddc2273984cd08
2016-12-02Revert "Use FQDN for rabbitmq's nodename env variable"Ben Nemec1-7/+1
This seems to have broken the updates job, causing it to fail with following error: Can't set long node name!\nPlease check your configuration\n Related-Bug: 1646873 This reverts commit 3e9fcfd09320ace07bc1bd4cb57feb98cd057332. Change-Id: I72ba891cd9cd8c4f1bc204144f46aaabbdfd3647
2016-12-02Merge "scenario001: deploy Cinder with RBD backend"Jenkins2-1/+15
2016-12-02Add zaqar to the controller's list of services in roles_data.yamlJuan Antonio Osorio Robles1-0/+1
Change-Id: Iecafa7878fec20c707e94bdaca55f1489f3e338a
2016-12-02Merge "Add Zaqar to scenario002"Jenkins2-1/+9
2016-12-02Merge "Composable Zaqar services"Jenkins8-0/+597
2016-12-02Move nodes' fqdns to a map to remove clutterJuan Antonio Osorio Robles6-679/+660
There were several instances where the short-names/FQDNs where being gotten in the same way in the role's templates. So this introduces a mapping to get these values in order to reduce clutter. Change-Id: Ie7df360bb69d56655f3e0fcbbf4d297db39b7a26
2016-12-02Merge "Use FQDN for rabbitmq's nodename env variable"Jenkins1-1/+7
2016-12-02Merge "Use network-based fqdn entry from hiera instead of the custom fact"Jenkins11-21/+21
2016-12-02Merge "scenario001: deploy Ceph"Jenkins1-3/+24
2016-12-02Merge "Implement scenario004 with Ceph Rados Gateway scenario"Jenkins2-0/+189
2016-12-01Merge "scenario003: configure Keystone tokens with Fernet provider"Jenkins1-0/+1
2016-12-01Make get-occ-config.sh support custom rolesJames Slagle2-12/+25
Updates the get-occ-config.sh script used with the deployed-server environment to support custom roles. Any custom role name, and a corresponding set of hosts (ip addresses or hostnames) can now be passed to the script and it will query for the proper nested stack uuid's and configure os-collect-config appropriately on the respective nodes. Change-Id: I8fc39e6d18cd70ff881e2a284234b26261018d67
2016-12-01scenario001: deploy Cinder with RBD backendEmilien Macchi2-1/+15
Improve scenario001 with Cinder + RBD coverage. Also remove Barbican bits, we don't deploy Barbican in scenario001, but 002. Change-Id: Ib9cadbefcb3ddcdb4812f47ff5496e74b2bd888d
2016-12-01Merge "ceph-rgw: add missing user parameter"Jenkins1-0/+1
2016-12-01Merge "scenario001/pingtest: remove gnocchi_res_alarm"Jenkins1-13/+15
2016-12-01scenario003: configure Keystone tokens with Fernet providerEmilien Macchi1-0/+1
Improve scenario003 to configure Keystone tokens with Fernet provider. Scenario001 and scenario002 will still deploy uuid for now. Change-Id: I8c671d0371b2c3590b58b9623bb0df0b0c625a5b
2016-12-01Implement scenario004 with Ceph Rados Gateway scenarioEmilien Macchi2-0/+189
Like Puppet OpenStack CI, implement scenario004 with Ceph RGW scenario, where Glance uses it as a image storage backend. Change-Id: If055ca225c456a738c5726ef1e76a4a4f9c566a8
2016-12-01ceph-rgw: add missing user parameterEmilien Macchi1-0/+1
'user' is required or puppet-ceph will complain that the Keystone_user has no title: Evaluation Error: Missing title. The title expression resulted in undef at /etc/puppet/modules/ceph/manifests/rgw/keystone/auth.pp The value is set to Swift, as we use the same credentials as Swift service. Closes-Bug: #1642524 Change-Id: Ib4a7c07086b0b3354c8e589612f330ecdffdc637
2016-12-01Merge "Initial support for composable upgrades with Heat+Ansible"Jenkins13-3/+253
2016-12-01Merge "Introduce network-based FQDNs via hiera"Jenkins6-0/+217
2016-12-01Merge "Make pep8 task run template generation"Jenkins1-2/+4
2016-12-01Merge "Add local template generation tox task"Jenkins5-0/+150
2016-12-01scenario001: deploy CephEmilien Macchi1-3/+24
Add Ceph to scenario001 and use it as a backend for Nova, Glance and Gnocchi. Change-Id: I29065d4b2ac39db40984873fda550d7adbe904fe
2016-12-01scenario001/pingtest: remove gnocchi_res_alarmEmilien Macchi1-13/+15
The resource is failing and it prevents us to add more coverage. Until we figure what's wrong with it, let's disable it. Change-Id: If89775bf67d686327d0d27222e0c9179be74a668
2016-12-01Merge "Make scenario template paths relative"Jenkins1-5/+5
2016-12-01Merge "Configure /etc/hosts via os-collect-config script"Jenkins3-7/+64
2016-12-01Merge "Show team and repo badges on README"Jenkins1-0/+9
2016-12-01Initial support for composable upgrades with Heat+AnsibleSteven Hardy13-3/+253
This shows how we could wire in the upgrade steps using Ansible as was previously proposed e.g in https://review.openstack.org/#/c/321416/ but it's more closely integrated with the new composable services architecture. It's also very similar to the approach taken by SpinalStack where ansible snippets per-service were combined then run in a series of steps using Ansible tags. This patch just enables upgrade of keystone - we'll add support for other patches in subsequent patches. Partially-Implements: blueprint overcloud-upgrades-per-service Change-Id: I39f5426cb9da0b40bec4a7a3a4a353f69319bdf9
2016-12-01Merge "Hiera optimization: use a new hiera hook"Jenkins27-475/+389
2016-12-01Merge "Fix puppet/services/README.rst step description"Jenkins1-6/+0
2016-12-01Use FQDN for rabbitmq's nodename env variableJuan Antonio Osorio Robles1-1/+7
Change-Id: Iee1afeced0b210a46b273aafc0d40e99d6ee6d4e
2016-12-01Use network-based fqdn entry from hiera instead of the custom factJuan Antonio Osorio Robles11-21/+21
This changes how we get the network-based FQDNs for the specific services, from using the custom fact, to the new hiera entries. Change-Id: Iae668a5d89fb7bee091db4a761aa6c91d369b276
2016-12-01Introduce network-based FQDNs via hieraJuan Antonio Osorio Robles6-0/+217
Currently, one can get the network-based FQDNs via a custom puppet fact. This is currently unreliable, as it's based on the ::hostname fact which we assume it's set correctly by nova. However, this is not necessarily the case (for instance, if you use pre-deployed services such as we do with the multinode-jobs). In these cases, the ::hostname fact will return something other than what we specified in nova, and effectively breaks the configurations in we relly too much on the network-based FQDN facts. By using hiera instead, we avoid this issue as we set those values to be exactly what we expect (as we set them in the OS::TripleO::Server resource. Change-Id: I6ce31237098f57bdc0adfd3c42feef0073c224fb
2016-11-30Hiera optimization: use a new hiera hookDan Prince27-475/+389
This patch optimizes how we deploy hiera by using a new heat hook specifically designed to help compose hiera within heat templates. As part of this change: - we update all the 'hiera' software configurations to set the group to hiera instead of os-apply-config. - The new format uses JSON instead of YAML. The hook actually writes out the hiera JSON directly so no conversion takes place. Arrays, Strings, Booleans all stay in their native formats. As such we can avoid having to do many of the awkward string and list conversions in t-h-t to support the previous YAML formatting. - The new hook prefers JSON over YAML so upgrading users will have the new files prefered. (we will post a cleanup routine for the old files soon but this isn't a new behavior, JSON is now simply prefered.) - A lot of services required edits to account for default settings that worked in YAML that no longer work correctly in the native JSON format. In almost all these cases I think the resulting codes looks cleaner and is more explicit with regards to what is getting configured in hiera on the actual nodes. Depends-On: I6a383b1ad4ec29458569763bd3f56fd3f2bd726b Closes-bug: #1596373 Change-Id: Ibe7e2044e200e2c947223286fdf4fd5bcf98c2e1
2016-11-30Make pep8 task run template generationDan Prince1-2/+4
This patch updates the pep8 task (which is executed in CI) so that it generates templates locally. This will give us extra CI coverage to ensure our generated templates produce valid YAML. Change-Id: I2287802d44c0ebe404d3fce30f04efcc3c6ab27f
2016-12-01Use transient hostname for deployed serversSteve Baker1-17/+2
The name output returned by this template is expected to be the short name rather than a FQDN. Generally 'hostnamectl --static' returns a FQDN and --transient will be the short name. This change switches to using --transient and also simplifies the script by dropping the unused outputs. Change-Id: I19eaf9f66668f7e68765bad4018c0c60314f3f8f
2016-11-30Deployed server: switch to apply-config hookDan Prince1-1/+1
This patch switches the deployed-server.yaml template to use apply-config instead of os-apply-config. The 'apply-config' hook is now installed via a package (no longer requires elements for installation) and supports more signalling options. This is required to support the undercloud installer which doesn't work with os-collect-config heat metadata. Change-Id: I7963fe4f38e8f04c9871fe651d39efec1aa17c41
2016-11-30Add local template generation tox taskDan Prince5-0/+150
This patch adds a local version of our template processing routine so that developers can more quickly view the templates that are actually getting generated. I've noticed multiple developers now do a full deployment with 'overcloud deploy' only to download the swift container with the generated templates. This simple task avoids that step by allowing developers to generate it locally. It also aims to preserve the ability to use t-h-t templates directly with Heat (instead of going through Mistral) should users wish to do that. The new undercloud heat installer requires the ability to generate templates without requiring Mistral and Swift to do so. Ideally the Mistral API workflow would use this same code so perhaps in the future we might modify that routine to: -download swift tarball containing the templates -run this local routine that lives in t-h-t -re-upload the tarball of templates to the swift container Change-Id: Ie664c9c5f455b7320a58a26f35bc403355408d9b
2016-11-30Configure /etc/hosts via os-collect-config scriptDan Prince3-7/+64
This patch moves the t-i-e element code for hosts configuration into a t-h-t shell script that gets driven by a os-collect-config script hook. This helps accomplish several goals: - moves us away from t-i-e - gives us better signal handling in the error case (where the previous element relied on 99-refresh-completed - Allows the t-h-t undercloud installer to more easily consume this since it doesn't rely on the old os-apply-config metadata (which that installer doesn't support). Change-Id: I73c3d4818ef531a3559fab272521f44519e2f486
2016-11-30Merge "Add Neutron network type and VLAN ranges to network-environment.yaml"Jenkins1-0/+5