Giulio Fidente [Thu, 21 Jul 2016 09:39:56 +0000 (11:39 +0200)]
Remove unused redis_vip parameter
Depends-On: I6ba962c682dc2ab8c6ee5238e0c176d9ae05d696
Change-Id: I796524128c49fe1927e96288d40b257a4d862ee7
Jenkins [Thu, 21 Jul 2016 07:46:29 +0000 (07:46 +0000)]
Merge "Fix KeystoneWorkers default value"
Jenkins [Wed, 20 Jul 2016 20:26:18 +0000 (20:26 +0000)]
Merge "Fix ceilometer auth url for compute"
Jiri Stransky [Wed, 20 Jul 2016 12:23:05 +0000 (14:23 +0200)]
Fix KeystoneWorkers default value
The current default doesn't get expanded to its real value correctly,
the new one should work better, it's according to hiera docs:
https://docs.puppet.com/hiera/3.2/variables.html
Change-Id: I8d1df131d2f1eee4ae0f725358d33a3ecfa3175a
Pradeep Kilambi [Wed, 20 Jul 2016 14:12:17 +0000 (10:12 -0400)]
Fix ceilometer auth url for compute
Due to a recent change introduced in puppet ceilometer[1]
ceilometer auth type defaults to password type and v2
auth_url doesnt work with domain. This fixes the url to
not include suffix.
[1] https://review.openstack.org/#/c/320454/
Change-Id: If672b78b8ce9addf831f5b72a702447e1422f30e
Marius Cornea [Tue, 19 Jul 2016 17:45:21 +0000 (19:45 +0200)]
Fix gnocchi::storage::ceph::ceph_keyring
This change configures gnocchi::storage::ceph::ceph_keyring to a
valid ceph keyring location.
Change-Id: I29fb0cb8a865353a43246a09d1c08eb0cf872cea
Closes-Bug:
1604508
Jenkins [Tue, 19 Jul 2016 15:31:28 +0000 (15:31 +0000)]
Merge "Repurpose KeystoneWorkers add keystone::wsgi::apache::threads"
Jenkins [Tue, 19 Jul 2016 11:10:57 +0000 (11:10 +0000)]
Merge "gnocchi: configure db_sync command in the profile"
Jenkins [Tue, 19 Jul 2016 07:12:08 +0000 (07:12 +0000)]
Merge "Add MysqlNoBracketsInternal to enable-tls.yaml"
Jenkins [Mon, 18 Jul 2016 21:06:13 +0000 (21:06 +0000)]
Merge "Remove enable_load_balancer on nonha manifest"
Jenkins [Mon, 18 Jul 2016 21:03:38 +0000 (21:03 +0000)]
Merge "Don't collect gnocchi-service tag in THT"
Jenkins [Mon, 18 Jul 2016 21:01:46 +0000 (21:01 +0000)]
Merge "Remove useless mongodb variables in ha manifest"
Jenkins [Mon, 18 Jul 2016 20:50:16 +0000 (20:50 +0000)]
Merge "overcloud_compute.pp: remove nova_config params"
Emilien Macchi [Mon, 18 Jul 2016 20:16:18 +0000 (16:16 -0400)]
gnocchi: configure db_sync command in the profile
Configure db_sync extra command in the profile itself
Change-Id: Ia27068907a2149da2cb87b50ffe65b27a0542ed7
Emilien Macchi [Mon, 18 Jul 2016 14:38:35 +0000 (10:38 -0400)]
Remove enable_load_balancer on nonha manifest
The parameter is not used anywhere.
Change-Id: I31bd2b0524038b3a3b45f1c5b95fb02ef6cfa903
Jenkins [Mon, 18 Jul 2016 16:59:39 +0000 (16:59 +0000)]
Merge "Missing CephClientKey parameter in puppet-ceph-devel and storage-environment"
Emilien Macchi [Mon, 18 Jul 2016 15:31:12 +0000 (11:31 -0400)]
Remove useless mongodb variables in ha manifest
Remove useless parameters that move to puppet-tripleo some time ago.
Change-Id: I54e99f2012f0dd12eb9e1cbad5bc73827019934a
Emilien Macchi [Mon, 18 Jul 2016 14:34:46 +0000 (10:34 -0400)]
Don't collect gnocchi-service tag in THT
The gnocchi-service tag is already collected in puppet-tripleo Pacemaker
Gnocchi profile and was not removed here.
Change-Id: Ic38aeae849d16db36663f16156d1c9fbcf86784a
Emilien Macchi [Mon, 18 Jul 2016 13:20:46 +0000 (09:20 -0400)]
overcloud_compute.pp: remove nova_config params
Remove usage of nova_config for 2 parameters. The parameters were here
for legacy and should not be useful anymore.
Change-Id: Ifd4e89ff43ab7ebc5c69dec526696eb9902aa621
Juan Antonio Osorio Robles [Mon, 18 Jul 2016 12:13:47 +0000 (15:13 +0300)]
Add MysqlNoBracketsInternal to enable-tls.yaml
Change-Id: Ife466e6a8b8112777d4c0e845e31fa633da5e53d
Emilien Macchi [Mon, 11 Jul 2016 15:06:03 +0000 (11:06 -0400)]
Move MySQL Galera within composable services
This patch just moves the Puppet code into puppet-tripleo.
A future iteration will be to move parameters within the service
template.
Closes-Bug: #
1601853
Depends-On: I7ddae28a6affd55c5bffc15d72226a18c708850e
Change-Id: I51a05dbf53f516b200c146b35529ce563ce9ac7b
Jenkins [Thu, 14 Jul 2016 12:56:12 +0000 (12:56 +0000)]
Merge "Composable Pacemaker service"
Emilien Macchi [Mon, 11 Jul 2016 19:47:28 +0000 (15:47 -0400)]
Composable Pacemaker service
Deploy Pacemaker using composable services.
Change-Id: I038514812af5a9f30260a81ea3366d46bee4ee4e
Depends-On: I46215f82480854b5e04aef1ac1609dd99455181b
Closes-Bug: #
1601970
Emilien Macchi [Mon, 20 Jun 2016 18:47:49 +0000 (14:47 -0400)]
Ceilometer Compute Agent composable service
Implement the service for ceilometer agent compute.
Change-Id: I5ab3887832588ce26e2d258d05f725d87d2c103d
Pradeep Kilambi [Tue, 12 Jul 2016 20:31:07 +0000 (16:31 -0400)]
Remove ceilometer mysql db hieradata
We already moved this to service templates
Change-Id: Ic3c59a8ef753d8ea09900e9020779ccb55f3bd07
Jenkins [Tue, 12 Jul 2016 20:17:44 +0000 (20:17 +0000)]
Merge "Gnocchi composable roles"
Jenkins [Tue, 12 Jul 2016 18:55:43 +0000 (18:55 +0000)]
Merge "Fix network-isolation.yaml to stop clobbering Management net"
Jenkins [Tue, 12 Jul 2016 18:36:04 +0000 (18:36 +0000)]
Merge "Combine BootstrapNodeDeployment with AllNodesDeployment"
Jenkins [Tue, 12 Jul 2016 18:17:08 +0000 (18:17 +0000)]
Merge "compute: moving out iscsi bits, now in puppet-tripleo"
Jenkins [Tue, 12 Jul 2016 17:43:29 +0000 (17:43 +0000)]
Merge "Composable OpenContrail compute plugin"
Jenkins [Tue, 12 Jul 2016 17:42:05 +0000 (17:42 +0000)]
Merge "Composable Plumgrid compute plugin"
Jenkins [Tue, 12 Jul 2016 17:41:20 +0000 (17:41 +0000)]
Merge "Composable Midonet compute plugin"
Jenkins [Tue, 12 Jul 2016 17:38:54 +0000 (17:38 +0000)]
Merge "Composable Nuage Compute Plugin"
Jenkins [Tue, 12 Jul 2016 17:37:44 +0000 (17:37 +0000)]
Merge "Composable Neutron Core Compute Plugin"
Jenkins [Tue, 12 Jul 2016 15:19:18 +0000 (15:19 +0000)]
Merge "Use already Deployed/Installed servers"
Jenkins [Tue, 12 Jul 2016 14:53:13 +0000 (14:53 +0000)]
Merge "Add a second proxy-logging middleware entry to swift-proxy"
Dan Sneddon [Wed, 22 Jun 2016 21:50:23 +0000 (14:50 -0700)]
Fix network-isolation.yaml to stop clobbering Management net
The network-isolation.yaml file explicitly set the Management
network to None and the ports to noop.yaml. This resulted in the
Management network being disabled if network-management.yaml was
included before network-isolation.yaml.
These changes comment out the Management declarations to show the
default, and mention that network-management.yaml may be included.
Since the Management network is disabled by default, it isn't
necessary to noop it here. This change also places the Redis VIP
in a more logical place next to the controller ports.
Change-Id: I50a71b3ddf77bda2d213821da5e4260b503a6cb7
Fixes-bug:
1602283
Dan Prince [Wed, 6 Jul 2016 18:23:54 +0000 (14:23 -0400)]
Composable OpenContrail compute plugin
Adds a new neutron compute plugin used to help configure opencontrail
for use on compute nodes.
Change-Id: I67a649445d5f1cb21ab9483bae7f5f4c2c657142
Dan Prince [Wed, 6 Jul 2016 18:21:38 +0000 (14:21 -0400)]
Composable Plumgrid compute plugin
Adds a new neutron compute plugin used to help configure plumgrid
for use on compute nodes.
Change-Id: Ied6493aba826a602b2ce73359d1acf26ebe89869
Dan Prince [Wed, 6 Jul 2016 18:17:39 +0000 (14:17 -0400)]
Composable Midonet compute plugin
Adds a new neutron compute plugin used to help configure midonet
for use on compute nodes.
Change-Id: I3a6996d3d9557ecad5ccd26a3901caccbf111468
Dan Prince [Wed, 6 Jul 2016 18:03:37 +0000 (14:03 -0400)]
Composable Nuage Compute Plugin
Adds a new neutron compute plugin used to help configure nuage
for use on compute nodes.
Change-Id: I732ec85d1f0605e562dacb02624a355e425d911a
Depends-On: Ic842ebdc183918ec9a24f83ae39adfba27bc799c
Dan Prince [Wed, 6 Jul 2016 15:13:15 +0000 (11:13 -0400)]
Composable Neutron Core Compute Plugin
Create a new resource registry entry for a Neutron "compute plugin".
For ML2 this may be the same os the NeutronComputePlugin but patches
for other vendors will follow that require extra bits on nodes
where VMs will be created.
This patch removes the ML2 code from the compute role and instead
uses the existing composable services.
NOTE: we are able to remove the puppet resource chain to force OVS to
get restarted due to puppet-neutron commit:
Idb1332dd498bb3065720f2ccaf68e6b0e9fa80c3 which should resolve that
issue.
Co-Authored-By: Emilien Macchi <emilien@redhat.com>
Depends-On: I95b9188607ab6c599ad4cde6faa1deb081618f3e
Change-Id: I2496372ca6e6ba9f52e9a8bb6e8dc731c125af13
Emilien Macchi [Fri, 17 Jun 2016 16:11:36 +0000 (12:11 -0400)]
compute: moving out iscsi bits, now in puppet-tripleo
Move bits from THT to puppet-tripleo.
Implements: blueprint composable-services-within-roles
Change-Id: I9866506b120afdf35891a396ea1bbe1c0f592b3f
Depends-On: I495a7af4220f0b35e9fd0a6cfc146610d8f46d10
Pradeep Kilambi [Thu, 19 May 2016 02:26:22 +0000 (22:26 -0400)]
Gnocchi composable roles
Implements: blueprint composable-services-within-roles
Co-Authored-By: Juan Antonio Osorio Robles <jaosorior@redhat.com>
Co-Authored-By: Carlos Camacho <ccamacho@redhat.com>
Depends-On: Id728aae79442c45ab48fe0914c065f1807e8890d
Closes-Bug: #
1601846
Change-Id: I40a3815923099d00a0f3fc1d88a942784e7c6fb9
Carlos Camacho [Wed, 29 Jun 2016 13:25:23 +0000 (15:25 +0200)]
Composable Horizon service - tripleo-heat-templates
Add horizon as a composable service
Depends-on: Iff6508972edfd5f330b239719bc5eb14d3f71944
Change-Id: I734c3e0784c25f30adff2e13faf1155a3e45cefd
Partially-implements: blueprint composable-services-within-roles
Jenkins [Mon, 11 Jul 2016 20:52:35 +0000 (20:52 +0000)]
Merge "Combine parameter_default fields"
Jenkins [Mon, 11 Jul 2016 20:23:24 +0000 (20:23 +0000)]
Merge "Re-enable Ceilometer composable roles for controller"
James Slagle [Fri, 11 Sep 2015 20:55:24 +0000 (16:55 -0400)]
Use already Deployed/Installed servers
This patch provides a set of templates that enables
tripleo-heat-templates to be used with a set of already deployed,
installed, and running servers. In this method, Nova and Ironic are not
used to deploy any servers.
This approach is attractive for POC deployments where dedicated
provisioning networks are not available, or other server install methods
are dictated for various reasons.
There are also assumptions that currently have to be made about the software
installed on the already deployed servers. Effectively, they must match the
standard TripleO overcloud-full image.
Co-Authored-By: Steve Hardy <shardy@redhat.com>
Change-Id: I4ab1531f69c73457653f1cca3fe30cc32a04c129
Jenkins [Mon, 11 Jul 2016 18:03:28 +0000 (18:03 +0000)]
Merge "neutron: remove tenant MTU configuration options"
Jenkins [Mon, 11 Jul 2016 17:58:16 +0000 (17:58 +0000)]
Merge "Move ironic::db data within service template"
Marius Cornea [Mon, 11 Jul 2016 15:41:47 +0000 (17:41 +0200)]
Missing CephClientKey parameter in puppet-ceph-devel and storage-environment
This change adds the CephClientKey parameter to puppet-ceph-devel.yaml
and storage-environment.yaml environment files. This is needed when
--ceph-storage is not passed to the openstack overcloud deploy command
as the tripleo client doesn't generate the keys.
Change-Id: Idfdce190c2ad4ae198fe17474aee19cb76dac5fb
Closes-Bug: #
1601864
Emilien Macchi [Thu, 23 Jun 2016 20:09:14 +0000 (16:09 -0400)]
Re-enable Ceilometer composable roles for controller
This patch brings back Ceilometer composable roles for controller,
module some adjustments to make it work.
Fixes 3 issues in Ceilometer composable services
1) This patch fixes the hiera maps in the pacemaker ceilometer*
templates. These were lists and should be a map.
2) fixes a critical issue in ceilometer-base.yaml where the
password was incorrectly coded in the YAML using get_param on
a string which wasn't actually a parameter.
3) Fixes the ceilometer_coordination_url so that it uses a YAML anchor
as was implied instead of get_param on a string which wasn't a
parameter.
4) Fixes the default database connection to use mongodb and configured
in puppet-tripleo profile appropriately.
Co-Authored-By: Dan Prince <dprince@redhat.com>
Co-Authored-By: Pradeep Kilambi <pkilambi@redhat.com>
Closes-Bug: #
1601844
Change-Id: Ia0a59121b9ffd5e07647f66137ce53870bc6b5d6
Derek Higgins [Mon, 11 Jul 2016 14:11:01 +0000 (15:11 +0100)]
Add a second proxy-logging middleware entry to swift-proxy
Its absence results in swift using up all the memory available to it when
certain objects are requested, we are not sure exactly what triggers the
problem but we know this fixes it.
Change-Id: Iaf00a8a2a947e0683cc60fef2e75fd7c444d07a8
Closes-Bug: #
1595916
marios [Fri, 1 Jul 2016 10:01:08 +0000 (13:01 +0300)]
Repurpose KeystoneWorkers add keystone::wsgi::apache::threads
Now that keystone is run with wsgi apache the KeystoneWorkers
param has no efffect [1]. This repurposes KeystoneWorkers to now
set wsgi::apache::workers and adds the
keystone::wsgi::apache::threads hardcoding to 1 (can overrride
via extraconfig data)
[1] https://github.com/openstack/puppet-keystone/blob/
51c68fb127c28b9748b352871783c3ec6ef5c83b/manifests/init.pp#L396
Closes-Bug:
1598092
Change-Id: I503d1f0d3f4c56abfaf4609ea8290e78668013b6
Jenkins [Mon, 11 Jul 2016 12:38:30 +0000 (12:38 +0000)]
Merge "Include bulk in swift proxy pipeline"
Giulio Fidente [Fri, 1 Jul 2016 09:23:44 +0000 (11:23 +0200)]
Move ironic::db data within service template
Change-Id: If0b8fbc783e694f4f744ad848103d40df985fc04
Jenkins [Mon, 11 Jul 2016 10:44:32 +0000 (10:44 +0000)]
Merge "Move neutron::db data within service template"
Jenkins [Mon, 11 Jul 2016 10:42:24 +0000 (10:42 +0000)]
Merge "Move sahara::db data within service template"
Jenkins [Mon, 11 Jul 2016 10:42:16 +0000 (10:42 +0000)]
Merge "Move heat::db data within service template"
Jenkins [Mon, 11 Jul 2016 10:33:22 +0000 (10:33 +0000)]
Merge "Move cinder::db data within service template"
Jenkins [Mon, 11 Jul 2016 10:32:37 +0000 (10:32 +0000)]
Merge "Move glance::db data within service template"
Jenkins [Mon, 11 Jul 2016 10:32:00 +0000 (10:32 +0000)]
Merge "Move keystone::db data within service template"
Jenkins [Mon, 11 Jul 2016 10:26:54 +0000 (10:26 +0000)]
Merge "Pass MysqlVirtualIP without brackets to EndpointMap"
Jenkins [Mon, 11 Jul 2016 09:30:42 +0000 (09:30 +0000)]
Merge "Set os-refresh-config timeout to 4 hours"
Jenkins [Mon, 11 Jul 2016 09:16:37 +0000 (09:16 +0000)]
Merge "Template param for what command occ runs"
Giulio Fidente [Wed, 29 Jun 2016 11:01:48 +0000 (13:01 +0200)]
Move neutron::db data within service template
Change-Id: I07a81a2e1cc29df007bba11da82cf6661a55aadf
Giulio Fidente [Wed, 29 Jun 2016 10:59:53 +0000 (12:59 +0200)]
Move sahara::db data within service template
Change-Id: Ifb87f79e8cd692e6553d03df8394c74f51821e11
Giulio Fidente [Wed, 29 Jun 2016 10:58:11 +0000 (12:58 +0200)]
Move heat::db data within service template
Change-Id: I3fada6c5b0265bc6536c89da0ef4b709ead13b7d
Giulio Fidente [Wed, 29 Jun 2016 10:55:29 +0000 (12:55 +0200)]
Move cinder::db data within service template
Change-Id: I2aaf30289cc792e8860ca9c962d80baf7e804cbf
Giulio Fidente [Wed, 29 Jun 2016 10:53:33 +0000 (12:53 +0200)]
Move glance::db data within service template
Change-Id: I405bc9895160cc867f933e6b0d56546d460d2e3a
Dan Prince [Thu, 23 Jun 2016 14:52:43 +0000 (10:52 -0400)]
Composable Midonet for Neutron
Depends-On: I2393fc3c360f5f5786411f64dbcd06f380376093
Change-Id: I606cb1f7ef7d651b5d145bfa10ef3aa1561b1590
Partially-implements: blueprint composable-services-within-roles
Pradeep Kilambi [Fri, 8 Jul 2016 13:22:34 +0000 (09:22 -0400)]
Include bulk in swift proxy pipeline
With bulk delete enabled for gnocchi, this option should
be included in pipeline as well.
Change-Id: I5786c6f14e3aab9e167c22d8f72c5c1688440e95
Giulio Fidente [Wed, 29 Jun 2016 10:52:09 +0000 (12:52 +0200)]
Move keystone::db data within service template
Change-Id: I934aff4960588a3957b7a7bcc90385ae48d34d1e
Giulio Fidente [Thu, 7 Jul 2016 10:12:56 +0000 (12:12 +0200)]
Pass MysqlVirtualIP without brackets to EndpointMap
While the endpoints do need brackets around IPv6 addresses these
are not wanted by some of the puppet classes so we must pass the
non bracketed version as well.
It will allow us to remove the need for the MysqlVirtualIP param
passed to the controller role thouh when hieradata/database.yaml
is emptied.
Change-Id: If264b02a134b96368035f032e05d02e84f6499ed
Flavio Percoco [Thu, 16 Jun 2016 11:53:09 +0000 (13:53 +0200)]
Add StepConfig to docker compute-post.yaml
Change I84c97a76159704c2d6c963bc4b26e365764b1366 missed
`docker/compute-post.yaml`.
Change-Id: I680eabf2f316c7fccc9d53d75dc16139c9959c64
Jenkins [Fri, 8 Jul 2016 09:47:49 +0000 (09:47 +0000)]
Merge "Parametrize and increase default of swift-proxy node_timeout"
Giulio Fidente [Mon, 4 Jul 2016 16:22:19 +0000 (18:22 +0200)]
Merge pacemaker_master/sync_db conditionals
By condensing the pacemaker_master and sync_db conditions we ensure
there won't be unrelevant (clustercheck) execs deployed on
non-bootstrap nodes.
Closes-Bug:
1598907
Change-Id: Iae6aa13682d63096265f4751b2f71019a49f6fa6
Jenkins [Thu, 7 Jul 2016 09:44:20 +0000 (09:44 +0000)]
Merge "Convert AllNodesExtraConfig to OS::Heat::None"
Jenkins [Thu, 7 Jul 2016 09:40:19 +0000 (09:40 +0000)]
Merge "Remove config_identifier from all_nodes extraconfig examples"
Jenkins [Thu, 7 Jul 2016 07:52:05 +0000 (07:52 +0000)]
Merge "Restore the NtpServer parameter name"
Jenkins [Wed, 6 Jul 2016 18:24:26 +0000 (18:24 +0000)]
Merge "Add kernel service"
Jenkins [Wed, 6 Jul 2016 15:39:17 +0000 (15:39 +0000)]
Merge "Allow neutron_options customization for dashboard"
Dan Prince [Wed, 6 Jul 2016 13:59:18 +0000 (09:59 -0400)]
Restore the NtpServer parameter name
In
296bffde893dbbf36c62d664e24e2584b89b8070 we moved the NTP
into a composable service but changed the name of the parameter
to NtpServers. This will break upgrades for users of the previous
parameter name.
Closes-bug: #
1599526
Change-Id: I896b9427416f01b603ac9cc4d8c9ebf5e019cb32
Jenkins [Tue, 5 Jul 2016 20:33:55 +0000 (20:33 +0000)]
Merge "Split Heat pacemaker roles into separate services"
Jenkins [Tue, 5 Jul 2016 17:48:03 +0000 (17:48 +0000)]
Merge "pacemaker: don't override Service resource for Nova & Neutron"
Steven Hardy [Tue, 5 Jul 2016 16:48:28 +0000 (17:48 +0100)]
Convert AllNodesExtraConfig to OS::Heat::None
Instead of creating a nested stack, as it's slightly lower overhead
and will make things easier when adding custom roles (where a
hard-coded default template can't work)
Change-Id: If9f8294ba477d1c1364e19a52152905a2c02e959
Steven Hardy [Tue, 5 Jul 2016 16:46:23 +0000 (17:46 +0100)]
Remove config_identifier from all_nodes extraconfig examples
Since https://review.openstack.org/#/c/315616 this is no longer
required.
Change-Id: I0452d1577a25d19b4351bfe7830a6c7bbe485e67
Jenkins [Tue, 5 Jul 2016 14:05:36 +0000 (14:05 +0000)]
Merge "Use create-legacy-resource-types during gnocchi-upgrade"
Ihar Hrachyshka [Mon, 6 Jun 2016 13:36:54 +0000 (15:36 +0200)]
neutron: remove tenant MTU configuration options
Since Mitaka, Neutron and Nova do the right thing for MTU, correctly
calculating and applying MTU per network, considering its network type
and underlying physical network MTU (1500 by default). Neutron now also
correctly advertise proper MTU to instances through DHCP and RA
mechanisms. With that, there is no reason to have those MTU hacks in
deployment tools. Actually, they not only do no good, but break some
setups (Jumbo frame aware infrastructure), or at least make them
non-optimal (lowering instance MTU to 1400 when it's not needed, or when
tunnel overhead does not require 100 bytes).
Note that Neutron still has a set of configuration options to allow for
custom physical network MTUs (global_physnet_mtu, path_mtu,
physical_network_mtus). Those options define underlying infrastructure
though, not tenant MTUs. To support Jumbo frames, TripleO should allow
to set those options. That said, it's not the immediate goal of the
patch, and hence such an effort would require a separate patch.
Mitaka+ documentation on MTU configuration for Neutron:
http://docs.openstack.org/mitaka/networking-guide/adv-config-mtu.html
Change-Id: I540ba5dc69d0506f71b59746efcce94c73f9317f
Jenkins [Tue, 5 Jul 2016 12:34:08 +0000 (12:34 +0000)]
Merge "overcloud_volume: cleanup unused Puppet code"
Jenkins [Tue, 5 Jul 2016 12:30:34 +0000 (12:30 +0000)]
Merge "volume: deploy snmp using composable role"
Emilien Macchi [Mon, 4 Jul 2016 19:04:18 +0000 (15:04 -0400)]
Add kernel service
Add a new service that will load and configure kernel modules.
Depends-On: If4f1047ff8c193a14b821d8b826f637872cf62bd
Change-Id: I8f771712595d0f4826858b855985f65d3621c3f1
Steven Hardy [Mon, 4 Jul 2016 15:28:41 +0000 (16:28 +0100)]
Combine BootstrapNodeDeployment with AllNodesDeployment
Currently we have a special controller-only deployment which writes
the name/ip of the "bootstrap node", e.g the cluster master, which
defaults to the first node in the Controller ResourceGroup.
Now we're moving to fully composable services/roles, it's possible
folks will want to deploy services that expect to detect the bootstrap
node (e.g so only one node does a DB sync) for non-controller roles.
So, take this opportunity to combine the bootstrap node deployment with
the "all nodes" data, such that we deploy the same data for all roles.
Because the boostrap node data is per role cluster, rather than truly
global, we pass it via input_values into each per-role Deployment.
At some future point we might consider renaming this, e.g to
something which describes per-cluster config vs "all nodes",
but as a first step let's just rationalize the resources.
Change-Id: I4011526a13c51b3d0f95c17fe8ed38115b4fdce4
Jenkins [Tue, 5 Jul 2016 09:55:59 +0000 (09:55 +0000)]
Merge "Replace NodeConfigIdentifiers with DeployIdentifier"
Steve Baker [Mon, 4 Jul 2016 23:53:23 +0000 (11:53 +1200)]
Set os-refresh-config timeout to 4 hours
This change uses the new os-refresh-config --timeout argument to set a
kill timeout for stalled os-refresh-config runs.
4 hours is a reasonable conservative value since it matches the stack
timeout - but it can be set shorter in the future based on actual run
times.
Change-Id: I433f558515df24736263ec0d50de08ad8f78498f
Closes-Bug: #
1595722
DependsOn: Ibcbb2090aed126abec8dac49efa53ecbdb2b9b2c
Steve Baker [Mon, 4 Jul 2016 23:31:39 +0000 (11:31 +1200)]
Template param for what command occ runs
The ConfigCommand parameter overrides the server resource metadata to
specify what command os-collect-config runs whenever any configuration
data changes.
The default is already 'os-refresh-config' so this change has no
effect but it allows a future change to specify an
os-refresh-config --timeout argument to fix bug #
1595722.
Change-Id: I8dd35b6724d8c00e5495faca84ee8fee77641b82
Partial-Bug: #
1595722
Steven Hardy [Thu, 30 Jun 2016 18:14:52 +0000 (19:14 +0100)]
Remove depends_on: Networks from ControllerServiceChain
I think this depends_on is bogus - the Controller ResourceGroup does
depend on Networks, but not the ControllerServiceChain - this needs to
be consistent with the other ServiceChain definitions for the
custom-roles work.
Change-Id: I0159968719f5d21c8f216ad69af047fa141d54e9
Steven Hardy [Thu, 12 May 2016 13:58:39 +0000 (14:58 +0100)]
Replace NodeConfigIdentifiers with DeployIdentifier
We added NodeConfigIdentifiers to trigger config to be re-applied on
update, but then later added DeployIdentifier which forces config to
*always* be applied on update, so we can simplify things by just
referencing the DeployIdentifier directly.
Change-Id: I79212def1936740825b714419dcb4952bc586a39
Emilien Macchi [Mon, 4 Jul 2016 16:52:37 +0000 (12:52 -0400)]
overcloud_volume: cleanup unused Puppet code
overcloud_volume contains some code that is already deployed by
OS::TripleO::Services::CinderVolume service.
Change-Id: I3446883cb89dcf179a854e2adef81b899117f66a
Emilien Macchi [Mon, 4 Jul 2016 16:46:50 +0000 (12:46 -0400)]
volume: deploy snmp using composable role
Change-Id: Ibc9abf7043c37104d03cd72d882e10cdb53fe6a2