apex-tripleo-heat-templates.git
7 years agoAdd sriov_numvfs in THT
karthik s [Thu, 21 Jul 2016 11:20:08 +0000 (16:50 +0530)]
Add sriov_numvfs in THT

Allow the operator to configure sriov_numvfs for each of the
required SR-IOV interfaces.

Depends-On: I2c1fce461d4602cd9f7de44b34e94920d1a581a6
Change-Id: I56b7ae268535a8e423e65e8f1b99763c44d99eca
implements: blueprint tripleo-sriov
Signed-off-by: karthik s <ksundara@redhat.com>
7 years agoSR-IOV nic agent changes in line with composable roles.
Sanjay Upadhyay [Tue, 21 Jun 2016 14:58:10 +0000 (14:58 +0000)]
SR-IOV nic agent changes in line with composable roles.

This add sriov nic agent as composable service.

Implements: blueprint tripleo-sriov
Depends-On: I3385d831a339deec7d1315f74b501e76109db811

Co-Authored-By: Saravanan KR <skramaja@redhat.com>
Change-Id: I8d920f50da9e4261a9fdf702f7760efaa04a5278

7 years agoMerge "Add DefaultPasswords to composable services"
Jenkins [Sat, 20 Aug 2016 16:29:02 +0000 (16:29 +0000)]
Merge "Add DefaultPasswords to composable services"

7 years agoMerge "Pass ServiceNetMap to services"
Jenkins [Sat, 20 Aug 2016 13:03:26 +0000 (13:03 +0000)]
Merge "Pass ServiceNetMap to services"

7 years agoMerge "Disable Sahara by default"
Jenkins [Fri, 19 Aug 2016 20:07:00 +0000 (20:07 +0000)]
Merge "Disable Sahara by default"

7 years agoMerge "Remove OS::Tripleo::Services::ManilaShare: from puppet-pacemaker.yaml"
Jenkins [Fri, 19 Aug 2016 14:19:58 +0000 (14:19 +0000)]
Merge "Remove OS::Tripleo::Services::ManilaShare: from puppet-pacemaker.yaml"

7 years agoDisable Sahara by default
Dan Prince [Fri, 19 Aug 2016 12:53:37 +0000 (08:53 -0400)]
Disable Sahara by default

Users who want Sahara enable now can simply include the
environments/services/sahara.yaml Heat environment.

Change-Id: I3df96b6e78ba3eddb62e79d854862a7e2d614c51

7 years agoDisable cinder-backup by default
Giulio Fidente [Fri, 19 Aug 2016 09:54:54 +0000 (11:54 +0200)]
Disable cinder-backup by default

The cinder-backup service was not configured in mitaka, so
having it disabled by default does not change the existing
behavior.

Also adds an environment file to enable it in the pacemaker
scenario.

Change-Id: I9a238e0d4601c9f59aff94fdac837c7d0e90afa0

7 years agoAdd DefaultPasswords to composable services
Dan Prince [Wed, 17 Aug 2016 13:26:05 +0000 (09:26 -0400)]
Add DefaultPasswords to composable services

This patch adds a new DefaultPasswords parameter to
composable services. This is needed to help provide
access to top level password resources that overcloud.yaml
currently manages (passwords for Rabbit, Mysql, etc.).

Moving the RandomString resources into composable services
would cause them to regenerate within the stack. With this
approach we can leave them where they are while we deprecate
the top level mechanism and move the code that uses the
passwords into the composable services.

Change-Id: I4f21603c58a169a093962594e860933306879e3f

7 years agoPass ServiceNetMap to services
Giulio Fidente [Thu, 11 Aug 2016 21:07:46 +0000 (23:07 +0200)]
Pass ServiceNetMap to services

This will be needed to pick the network where the service has
to bind to from within the service template.

Change-Id: I52652e1ad8c7b360efd2c7af199e35932aaaea8c

7 years agoMerge "Add management network to list of networks to ping"
Jenkins [Thu, 18 Aug 2016 16:13:16 +0000 (16:13 +0000)]
Merge "Add management network to list of networks to ping"

7 years agoMerge "Upgrade scripts to migrate aodh alarm data"
Jenkins [Thu, 18 Aug 2016 15:45:07 +0000 (15:45 +0000)]
Merge "Upgrade scripts to migrate aodh alarm data"

7 years agoMerge "Add tripleo-firewall composable service"
Jenkins [Thu, 18 Aug 2016 14:45:59 +0000 (14:45 +0000)]
Merge "Add tripleo-firewall composable service"

7 years agoRemove OS::Tripleo::Services::ManilaShare: from puppet-pacemaker.yaml
Carlos Camacho [Wed, 17 Aug 2016 17:17:42 +0000 (19:17 +0200)]
Remove OS::Tripleo::Services::ManilaShare: from puppet-pacemaker.yaml

Already with the same value in overcloud-resource-registry-puppet.yaml

Change-Id: Ic274abddef5e229a3517f4f77d8192d6abf81044

7 years agoMerge "Make sahara run via systemd"
Jenkins [Thu, 18 Aug 2016 12:43:01 +0000 (12:43 +0000)]
Merge "Make sahara run via systemd"

7 years agoMerge "Add tripleo-packages composable service"
Jenkins [Thu, 18 Aug 2016 09:29:35 +0000 (09:29 +0000)]
Merge "Add tripleo-packages composable service"

7 years agoMerge "Rename NeutronServer to NeutronApi to align with ServiceNetMap"
Jenkins [Thu, 18 Aug 2016 04:24:26 +0000 (04:24 +0000)]
Merge "Rename NeutronServer to NeutronApi to align with ServiceNetMap"

7 years agoMerge "Remove deprecated node_ips hiera keys"
Jenkins [Wed, 17 Aug 2016 15:28:18 +0000 (15:28 +0000)]
Merge "Remove deprecated node_ips hiera keys"

7 years agoMerge "Decouple EndpointMap from SSL certificate params"
Jenkins [Wed, 17 Aug 2016 15:09:49 +0000 (15:09 +0000)]
Merge "Decouple EndpointMap from SSL certificate params"

7 years agoMerge "gnocchi: use new authtoken parameters"
Jenkins [Wed, 17 Aug 2016 15:02:19 +0000 (15:02 +0000)]
Merge "gnocchi: use new authtoken parameters"

7 years agoMake sahara run via systemd
Michele Baldessari [Tue, 16 Aug 2016 12:49:19 +0000 (14:49 +0200)]
Make sahara run via systemd

Via commit 0327fc2bbb1be9972d99e2e83d54d07410ad01d9 we added sahara
as a composable service. Let's make sure sahara-api and sahara-engine
run via systemd and not as a pacemaker resource. This is inline with the
HA NG spec.

Change-Id: I5634ad43771fba798892df6d2297c2634dcb6756

7 years agoUpgrade scripts to migrate aodh alarm data
Pradeep Kilambi [Mon, 8 Aug 2016 19:20:18 +0000 (15:20 -0400)]
Upgrade scripts to migrate aodh alarm data

In Newton, Aodh will be using its own mysql DB rather than
using ceilometer's mongo instance. This means we need to
migrate any existing alarm and alrm history data from
ceilometer DB to aodh mysqlDB. Upstream aodh provides us
with a aodh-data-migration utility. We need to invoke this
during the mitaka->newton upgrade procedure so data is
migrated as expected and aodh mysql backend takes over.

Closes-bug: #1611794

Change-Id: I17888b57ecf98cd83e92af2f9cdbead066b03aa3

7 years agoAdd tripleo-firewall composable service
Dan Prince [Mon, 15 Aug 2016 19:24:06 +0000 (15:24 -0400)]
Add tripleo-firewall composable service

This creates a new service to help manage the puppet-tripleo
class that enables firewall features. Currently has no settings
but this will keep our interfaces consistent.

Change-Id: I5ac85fa1e460b19ee2b1a9280413aebefe300845

7 years agoAdd tripleo-packages composable service
Dan Prince [Mon, 15 Aug 2016 19:11:38 +0000 (15:11 -0400)]
Add tripleo-packages composable service

This creates a new service to help manage the puppet-tripleo
class that enables and disables package installation features.

NOTE: we can't move the upgrade setting into the new composable
service yet due to coupling with the UpgradeDeployment resources.

Change-Id: If35cf6a6f023e12ae8ebbc2d9929d244eb3ffa3a

7 years agoMerge "Update Ironic composable services"
Jenkins [Wed, 17 Aug 2016 11:08:15 +0000 (11:08 +0000)]
Merge "Update Ironic composable services"

7 years agoMerge "Remove unneeded net_ip_map dump into hieradata"
Jenkins [Wed, 17 Aug 2016 09:17:05 +0000 (09:17 +0000)]
Merge "Remove unneeded net_ip_map dump into hieradata"

7 years agoMerge "Remove deprecated net_ip_uri_map output"
Jenkins [Wed, 17 Aug 2016 09:13:45 +0000 (09:13 +0000)]
Merge "Remove deprecated net_ip_uri_map output"

7 years agoMerge "Remove deprecated net_ip_subnet_map output"
Jenkins [Wed, 17 Aug 2016 09:12:23 +0000 (09:12 +0000)]
Merge "Remove deprecated net_ip_subnet_map output"

7 years agoMerge "Add cinder-backup service as role"
Jenkins [Wed, 17 Aug 2016 08:33:19 +0000 (08:33 +0000)]
Merge "Add cinder-backup service as role"

7 years agognocchi: use new authtoken parameters
Emilien Macchi [Mon, 15 Aug 2016 18:05:20 +0000 (14:05 -0400)]
gnocchi: use new authtoken parameters

Configure Gnocchi with authtoken new class in the Puppet module, and
also remove the useless parameters that didn't exist in the module.

Change-Id: I414990c4fd5c5c1cd43d50c7a3947a4a29f4587a

7 years agoMerge "Set coordination url for gnocchi storage"
Jenkins [Wed, 17 Aug 2016 01:00:58 +0000 (01:00 +0000)]
Merge "Set coordination url for gnocchi storage"

7 years agoMerge "Move neutron settings out of puppet/compute.yaml"
Jenkins [Tue, 16 Aug 2016 21:58:09 +0000 (21:58 +0000)]
Merge "Move neutron settings out of puppet/compute.yaml"

7 years agoMerge "Mv Ceilometer settings out of puppet/compute.yaml"
Jenkins [Tue, 16 Aug 2016 21:43:14 +0000 (21:43 +0000)]
Merge "Mv Ceilometer settings out of puppet/compute.yaml"

7 years agoMerge "Move Nova settings out of puppet/compute.yaml"
Jenkins [Tue, 16 Aug 2016 20:17:07 +0000 (20:17 +0000)]
Merge "Move Nova settings out of puppet/compute.yaml"

7 years agoRemove unneeded net_ip_map dump into hieradata
Giulio Fidente [Thu, 11 Aug 2016 20:56:26 +0000 (22:56 +0200)]
Remove unneeded net_ip_map dump into hieradata

We will lookup bind addresses using map_replace within the templates
so dumping net_ip_map as hieradata is unneeded.

Change-Id: If54c9033fc58d2cfaa040e30adeed7f58e44fd88

7 years agoRemove deprecated net_ip_uri_map output
Giulio Fidente [Thu, 11 Aug 2016 20:29:16 +0000 (22:29 +0200)]
Remove deprecated net_ip_uri_map output

Takes the net_ip_uri_map value from the *_uri values emitted
by net_ip_map instead.

Also removes TenantIp and TenantIpUri from net_vip_map_external
templates as there won't be any VIP on the tenant network.

Change-Id: Icdac3d58162891f5ca3d5c20f14fcdff1781996f

7 years agoRemove deprecated net_ip_subnet_map output
Giulio Fidente [Fri, 22 Jul 2016 14:22:06 +0000 (16:22 +0200)]
Remove deprecated net_ip_subnet_map output

Change-Id: I83ca923140d7f8ca3101e851e88ca3107a99555a

7 years agoMerge "Remove deprecated hdp plugin and add ambari"
Jenkins [Mon, 15 Aug 2016 19:52:33 +0000 (19:52 +0000)]
Merge "Remove deprecated hdp plugin and add ambari"

7 years agoMove neutron settings out of puppet/compute.yaml
Dan Prince [Thu, 11 Aug 2016 16:22:12 +0000 (12:22 -0400)]
Move neutron settings out of puppet/compute.yaml

This finishes moving most of the config settings out of
compute.yaml for Neutron and Rabbit. Also removes some
other misc unused parameters.

Change-Id: Ie340c33fb3434eb70e131ff6e252d0909aabd37c
Related-Bug: #1604412

7 years agoMv Ceilometer settings out of puppet/compute.yaml
Dan Prince [Thu, 11 Aug 2016 13:15:40 +0000 (09:15 -0400)]
Mv Ceilometer settings out of puppet/compute.yaml

This finishes moving most of the config settings out of
compute.yaml for Ceilometer.

Change-Id: I96369ebba28f0af4eb2d6d520b478213d8021822
Related-Bug: #1604412

7 years agoMove Nova settings out of puppet/compute.yaml
Dan Prince [Wed, 10 Aug 2016 21:35:30 +0000 (17:35 -0400)]
Move Nova settings out of puppet/compute.yaml

This finishes moving most of the config settings out of
compute.yaml for Nova and into the proper nova-* services.

Only the bind port/VIP related Nova settings remain now and those
will be dealt with in a follow up patch.

Change-Id: I1c40e7d54c11dfff2aaa6438c7701e98da17ebe6
Related-Bug: #1604412

7 years agoMerge "Convert ServiceNetMap to a nested template"
Jenkins [Mon, 15 Aug 2016 15:09:44 +0000 (15:09 +0000)]
Merge "Convert ServiceNetMap to a nested template"

7 years agoMerge "Remove NeutronEnableTunnelling from templates"
Jenkins [Mon, 15 Aug 2016 14:59:03 +0000 (14:59 +0000)]
Merge "Remove NeutronEnableTunnelling from templates"

7 years agoMerge "Remove KeystoneRegion from controller.yaml"
Jenkins [Sat, 13 Aug 2016 08:30:37 +0000 (08:30 +0000)]
Merge "Remove KeystoneRegion from controller.yaml"

7 years agoRemove NeutronEnableTunnelling from templates
Bob Fournier [Mon, 18 Jul 2016 22:21:27 +0000 (18:21 -0400)]
Remove NeutronEnableTunnelling from templates

As described in https://bugs.launchpad.net/tripleo/+bug/1532830,
the OVS agent no longer uses enable_tunneling, which is controlled by
NeutronEnableTunnelling, so this change removes NeutronEnableTunnelling
from the Heat templates.

This change depends on NeutronEnableTunnelling also being removed
from python-tripleoclient and puppet-neutron no longer using the
enable_tunneling hieradata.

Change-Id: I1ff6902ebd15041fc57ffff20a07455f171a004b
Closes-Bug: 1532830
Depends-On: I28d33592374f60cb5222a866efaf9d137aca1c5a
Depends-On: I73630653330c67444827f32740c44e9d25b5db31

7 years agoRename NeutronServer to NeutronApi to align with ServiceNetMap
Steven Hardy [Fri, 12 Aug 2016 13:55:08 +0000 (14:55 +0100)]
Rename NeutronServer to NeutronApi to align with ServiceNetMap

The new composable service name conflicts with the existing ServiceNetMap
naming, so align with NeutronApi since ServiceNetMap exists in current
released versions.

This is required so we can correctly generate the neutron_api_node_ips
list (needed by puppet-tripleo) based on the service_name.

Change-Id: Ic1d45cbaa77bc6ac9ca247c880a9845ca49905da
Partially-Implements: blueprint custom-roles

7 years agoRemove deprecated node_ips hiera keys
Steven Hardy [Fri, 12 Aug 2016 10:13:31 +0000 (11:13 +0100)]
Remove deprecated node_ips hiera keys

This aligns with the new naming conventions in puppet-tripleo, so
the keys can be more easily generated from the service_names.

Change-Id: Idb4a740e70257e3c69d8ec7d0c88594cc091b6a7
Partially-Implements: blueprint custom-roles
Depends-On: I423b544df174254ac511b906b0c570e701678022

7 years agoConvert ServiceNetMap to a nested template
Steven Hardy [Tue, 9 Aug 2016 16:56:14 +0000 (17:56 +0100)]
Convert ServiceNetMap to a nested template

We introduce a new ServiceNetMap resource which enables some more flexible
mappings between the services and their networks.

Specifically this patch means:

1. ServiceNetMap no longer has to specify the entire list of all services,
operators may if they wish, but a subset is now valid where you want to
accept the defaults for some services (the defaults are now accessible via
the ServiceNetMapDefaults parameter.

2. We can map some keys which don't fit a pattern that enables conversion
from CamelCase to snake_case which is required for compatibility with the
service_names in puppet/services*

This should be backwards compatible, and in future when we remove internal
dependency on the CamelCase names, we could also enable operators to
specify e.g heat_api_network in ServiceNetMap which would be more consistent.

Change-Id: Ib60198adf76bb69ffbafbfac739e356d153f6194
Partially-Implements: blueprint custom-roles

7 years agoMerge "Add parameter for enabling purging configuration files"
Jenkins [Fri, 12 Aug 2016 16:50:48 +0000 (16:50 +0000)]
Merge "Add parameter for enabling purging configuration files"

7 years agoMerge "Align node_ips hiera keys with the service name."
Jenkins [Fri, 12 Aug 2016 15:57:12 +0000 (15:57 +0000)]
Merge "Align node_ips hiera keys with the service name."

7 years agoMerge "Move gnocchi's kestone::auth parameters to API profile"
Jenkins [Fri, 12 Aug 2016 15:48:26 +0000 (15:48 +0000)]
Merge "Move gnocchi's kestone::auth parameters to API profile"

7 years agoDecouple EndpointMap from SSL certificate params
Ben Nemec [Wed, 27 Jul 2016 20:44:58 +0000 (15:44 -0500)]
Decouple EndpointMap from SSL certificate params

Having the endpoint map in the same environment as the SSL
certificate parameters means that every time a service is added to
the overcloud, the user must remember to update their copy of
enable-tls.yaml to reflect the new service.

To avoid this, let's separate the SSL EndpointMap from the SSL
certificates so users can simply pass the shipped list of SSL
endpoints and only have to customize the certificate env file. As
and added bonus, this means they won't have to put the certificates
in enable-tls.yaml specifically.  The parameters can be set
anywhere, and will be used as long as one of the tls-endpoints
envs is also specified.

inject-trust-anchor.yaml is not changed, but it could already be
used in the same fashion.  The root certificate param could be set
in any env passed after inject-trust-anchor.yaml, and then
inject-trust-anchor.yaml would only be responsible for setting the
appropriate resource_registry entry.  This way there is no need to
customize the in-tree inject-trust-anchor.yaml either.

Change-Id: I38eabb903b8382e6577ccc97e21fbb9d09c382b3

7 years agoMerge "Convert EndpointMap to not require per-service VIP parameters"
Jenkins [Fri, 12 Aug 2016 13:24:20 +0000 (13:24 +0000)]
Merge "Convert EndpointMap to not require per-service VIP parameters"

7 years agoSet coordination url for gnocchi storage
Pradeep Kilambi [Thu, 11 Aug 2016 20:37:01 +0000 (16:37 -0400)]
Set coordination url for gnocchi storage

Change-Id: I8107b84eaea8baf3ed664c70d4cf16537d869bcb

7 years agoUpdate Ironic composable services
Dmitry Tantsur [Wed, 13 Jul 2016 11:12:27 +0000 (13:12 +0200)]
Update Ironic composable services

* Add service for configuring Nova compute with Ironic
* Fix authentication in Ironic APU
* Provide a separate environment file for enabling Ironic

Change-Id: I211e6d91eacd238b04a1aa37528d5a91523407d9
Partially-Implements: blueprint ironic-integration

7 years agoReinstate CloudDomain properties for Controller/Compute roles
Steven Hardy [Thu, 11 Aug 2016 13:04:28 +0000 (14:04 +0100)]
Reinstate CloudDomain properties for Controller/Compute roles

These were removed in https://review.openstack.org/#/c/347050
but it turns out the defaults in the role templates is bad, as
an empty string results in a malformed hosts file fqdn.

So, partially revert that patch so we always pass the global
CloudDomain from overcloud.yaml, accepting the default configured
there, and remove the empty-string defaults in the role templates.

Change-Id: I0ea4190a23488986a3ee9e887328e0e7a03fe3aa

7 years agoConvert EndpointMap to not require per-service VIP parameters
Steven Hardy [Fri, 15 Jul 2016 13:11:35 +0000 (14:11 +0100)]
Convert EndpointMap to not require per-service VIP parameters

Currently we have a hard-coded set of per-service parameters, which
will cause problems for custom roles and full composability.

As a first step towards making this more configurable, remove the
hard-coded per-service parameters from overcloud.yaml, and adjust
the EndpointMap generation to instead accept two mappings, the
ServiceNetMap and a mapping of networks to IPs (effectively this
just moves the map lookup inside the endpoint map instead of
inside overcloud.yaml)

Change-Id: Ib522e89c36eed2115a6586dd5a6770907d9b33db
Partially-Implements: blueprint custom-roles

7 years agoMerge "Add hieradata for Manila v1 and v2 endpoints"
Jenkins [Thu, 11 Aug 2016 11:24:38 +0000 (11:24 +0000)]
Merge "Add hieradata for Manila v1 and v2 endpoints"

7 years agoAlign node_ips hiera keys with the service name.
Steven Hardy [Wed, 10 Aug 2016 17:01:37 +0000 (18:01 +0100)]
Align node_ips hiera keys with the service name.

To enable composable generation of this switch the key names
to align with the service_name of each service.

Note that this should depend on I423b544df174254ac511b906b0c570e701678022
and previously passed CI with that defined, but because we now run
gate validation jobs on puppet-tripleo it's impossible to land, so
this now contains both old and new hiera keys temporarily, which will
be removed when the puppet-tripleo patch lands.

Change-Id: I7febf28bf409e25e8e5961ab551b6d56bb11e0c6
Partially-Implements: blueprint custom-roles

7 years agoMerge "Add support for cinder v3 endpoint"
Jenkins [Thu, 11 Aug 2016 10:43:10 +0000 (10:43 +0000)]
Merge "Add support for cinder v3 endpoint"

7 years agoAdd hieradata for Manila v1 and v2 endpoints
Juan Antonio Osorio Robles [Mon, 8 Aug 2016 11:08:14 +0000 (14:08 +0300)]
Add hieradata for Manila v1 and v2 endpoints

manila::keystone::auth assumes that two endpoints will be created;
one for each version of Manila. This is not consistent with what we
provide to the manifest. So we then add the needed endpoint to the
EndpointMap.

v2 is left as the default (not needing to specify a version when
getting the value from the endpoint map), and v1 was added as an
extra suffix.

Change-Id: Ie8754fbb21f50c2613a2c05a52d771f4d1aeb4bb

7 years agoMerge "Remove Compute role parameters from overcloud.yaml"
Jenkins [Thu, 11 Aug 2016 05:43:55 +0000 (05:43 +0000)]
Merge "Remove Compute role parameters from overcloud.yaml"

7 years agoMerge "Allow map_replace substitution of network names"
Jenkins [Wed, 10 Aug 2016 23:55:17 +0000 (23:55 +0000)]
Merge "Allow map_replace substitution of network names"

7 years agoAdd support for cinder v3 endpoint
Juan Antonio Osorio Robles [Wed, 10 Aug 2016 10:17:58 +0000 (13:17 +0300)]
Add support for cinder v3 endpoint

This adds the needed parts for the keystone endpoint of cinder v3
API.

Change-Id: Ic56446095e72b9e469a7b0e9ea5159fa31847381

7 years agoAdd cinder-backup service as role
Erno Kuvaja [Tue, 12 Apr 2016 12:19:34 +0000 (15:19 +0300)]
Add cinder-backup service as role

Tempest tests for cinder contain backup tests that fail
unless cinder-backup service is started. This patch facilitates
the service start upon the overcloud deployment.

Original patch converted to composable role.

Co-Authored-By: Giulio Fidente <gfidente@redhat.com>
Depends-On: Ib1dfe52b83ab01819fc669312967950e75d8ddf1
Change-Id: I9ca97b3f1c26aac6d81b3525377e1f5fb962313f

7 years agoAdd parameter for enabling purging configuration files
Brent Eagles [Wed, 10 Aug 2016 14:43:51 +0000 (12:13 -0230)]
Add parameter for enabling purging configuration files

This patch adds a parameter, EnableConfigPurge, to the base nova and
neutron service files. The value is passed to their respective puppet
modules to control whether resources not managed by puppet are purged
from the config files. The default value is set to true.

Change-Id: I32732dc2ed7a7b3187e8727592cb4add0c6b9cf6
Closes-Bug:  #1611800

7 years agoMerge "Retain existing ComputeHostnameFormat when upgrading older envs"
Jenkins [Wed, 10 Aug 2016 08:48:12 +0000 (08:48 +0000)]
Merge "Retain existing ComputeHostnameFormat when upgrading older envs"

7 years agoAllow map_replace substitution of network names
Steven Hardy [Thu, 21 Jul 2016 15:24:09 +0000 (16:24 +0100)]
Allow map_replace substitution of network names

To allow per-node data such as bind_ip's to move into the
composable services templates, we do a value substitution
on the config settings hiera map, where e.g internal_api
will be replaced with the NetIpMap IP assigned to that.

To enable subnet/uri lookup via the same method, we add
all the subnet/uri mappings to the main net_ip_map output.

Change-Id: I7850d4dc8bf4db5f7ac6a6b53c1d900b561b4580

7 years agoRemove KeystoneRegion from controller.yaml
Juan Antonio Osorio Robles [Mon, 8 Aug 2016 10:48:24 +0000 (13:48 +0300)]
Remove KeystoneRegion from controller.yaml

this is no longer needed here as it's not used anymore.

Change-Id: I8aa9cc5f991fccc8c9acc81fb96e71b7e3fc145e

7 years agoMove gnocchi's kestone::auth parameters to API profile
Juan Antonio Osorio Robles [Mon, 8 Aug 2016 10:40:23 +0000 (13:40 +0300)]
Move gnocchi's kestone::auth parameters to API profile

In the move to composable services, these parameters are not
necessary in the controller, but in the profile itself. They are not
yet in use but will be used to populate the keystone endpoint.

Change-Id: Iab3ab05e16872d94d3b3ab4827e2f87f4970aee3

7 years agoMerge "Disable mistral services by default."
Jenkins [Tue, 9 Aug 2016 13:05:58 +0000 (13:05 +0000)]
Merge "Disable mistral services by default."

7 years agoRemove Compute role parameters from overcloud.yaml
Steven Hardy [Tue, 26 Jul 2016 11:52:31 +0000 (12:52 +0100)]
Remove Compute role parameters from overcloud.yaml

To enable custom-roles we need to pass these directly into th
role template (where these are already defined with the same
names).  The remaining parameters which will be removed in
subsequent patches, as some will require additional work to
ensure backwards compatibility.

Change-Id: I5a7e4f12aa7b9697086c1e19a4f7fcb24198c1d4
Partially-Implements: blueprint custom-roles

7 years agoMerge "Remove outdated Neutron auth options"
Jenkins [Tue, 9 Aug 2016 12:43:09 +0000 (12:43 +0000)]
Merge "Remove outdated Neutron auth options"

7 years agoMerge "Remove static hieradata"
Jenkins [Tue, 9 Aug 2016 12:39:18 +0000 (12:39 +0000)]
Merge "Remove static hieradata"

7 years agoMerge "Move neutron-related options for nova to base profile"
Jenkins [Tue, 9 Aug 2016 12:30:44 +0000 (12:30 +0000)]
Merge "Move neutron-related options for nova to base profile"

7 years agoMerge "Move nova's kestone::auth parameters to API profile"
Jenkins [Tue, 9 Aug 2016 09:35:24 +0000 (09:35 +0000)]
Merge "Move nova's kestone::auth parameters to API profile"

7 years agoMerge "Move setting of Glance's keystone region to API profile"
Jenkins [Tue, 9 Aug 2016 09:25:08 +0000 (09:25 +0000)]
Merge "Move setting of Glance's keystone region to API profile"

7 years agoMerge "Configure project name for keystone::auth resource in heat"
Jenkins [Tue, 9 Aug 2016 09:25:02 +0000 (09:25 +0000)]
Merge "Configure project name for keystone::auth resource in heat"

7 years agoMerge "Move cinder's kestone::auth parameters to API profile"
Jenkins [Tue, 9 Aug 2016 09:24:55 +0000 (09:24 +0000)]
Merge "Move cinder's kestone::auth parameters to API profile"

7 years agoMerge "Move neutron's kestone::auth parameters to server profile"
Jenkins [Tue, 9 Aug 2016 08:28:17 +0000 (08:28 +0000)]
Merge "Move neutron's kestone::auth parameters to server profile"

7 years agoMove neutron-related options for nova to base profile
Juan Antonio Osorio Robles [Mon, 8 Aug 2016 13:01:01 +0000 (16:01 +0300)]
Move neutron-related options for nova to base profile

Change-Id: I21c09b2b0bad7736f3c84c55bf14ef7986c2d108

7 years agoMove nova's kestone::auth parameters to API profile
Juan Antonio Osorio Robles [Mon, 8 Aug 2016 10:47:01 +0000 (13:47 +0300)]
Move nova's kestone::auth parameters to API profile

In the move to composable services, these parameters are not
necessary in the controller, but in the profile itself. They are not
yet in use but will be used to populate the keystone endpoint.

Change-Id: I42e30243b631c10d9454da444afdb50e551bbb2c

7 years agoMerge "Move *Flavor parameters into per-role templates"
Jenkins [Tue, 9 Aug 2016 02:45:31 +0000 (02:45 +0000)]
Merge "Move *Flavor parameters into per-role templates"

7 years agoRemove deprecated hdp plugin and add ambari
Sagi Shnaidman [Mon, 8 Aug 2016 20:50:03 +0000 (23:50 +0300)]
Remove deprecated hdp plugin and add ambari

HDP plugin was deprecated in newton and not supported in sahara
replace it with supported ambari plugin

Change-Id: I6998e3e1e1fe9a81c7941aec90c876ee133a601d
Closes-bug: 1611107

7 years agoMerge "Support arbitrary attributes for the Ceph pools"
Jenkins [Mon, 8 Aug 2016 20:18:02 +0000 (20:18 +0000)]
Merge "Support arbitrary attributes for the Ceph pools"

7 years agoMerge "Make deployed-server OS::Neutron::Port optional"
Jenkins [Mon, 8 Aug 2016 19:56:53 +0000 (19:56 +0000)]
Merge "Make deployed-server OS::Neutron::Port optional"

7 years agoRemove static hieradata
Emilien Macchi [Thu, 4 Aug 2016 20:10:40 +0000 (16:10 -0400)]
Remove static hieradata

Static hieradata moved to composable services, we don't need the files
anymore. It also cleanup how we construct Hieradata configuration by
removing unused hiera files.

Change-Id: I19f85b6c1b734473cf908ddaca29ad966f9f5405

7 years agoSupport arbitrary attributes for the Ceph pools
Giulio Fidente [Mon, 25 Jul 2016 13:11:40 +0000 (15:11 +0200)]
Support arbitrary attributes for the Ceph pools

This change adds a CephPools parameter which can be used to
provide custom settings for any Ceph pool.

It also removes our custom setting for the default pg_num,
pgp_num and size so that these are used for the managed
pools (and can be overridden) but aren't enforced globally.

Change-Id: Idcf28bec46beabb1b590fc8e78b43e58d8e35717
Closes-Bug: 1517969
Depends-On: I38978f0f3119e4ab7dd45021e598253cb066cb5a

7 years agoMerge "Set Coordination url for central agent"
Jenkins [Mon, 8 Aug 2016 14:45:04 +0000 (14:45 +0000)]
Merge "Set Coordination url for central agent"

7 years agoMove setting of Glance's keystone region to API profile
Juan Antonio Osorio Robles [Mon, 8 Aug 2016 10:34:15 +0000 (13:34 +0300)]
Move setting of Glance's keystone region to API profile

This is not necessary in the controller.yaml and is more appropriate
in the profile.

Change-Id: Ie2badbd87eabb8404acff77e9aa5d091fbdd1499

7 years agoConfigure project name for keystone::auth resource in heat
Juan Antonio Osorio Robles [Mon, 8 Aug 2016 13:55:11 +0000 (16:55 +0300)]
Configure project name for keystone::auth resource in heat

Heat API and CFN API both need to have teh keystone::auth*::tenant
parameters configured.

Change-Id: Ibdc3d693f5a63362add3fc71064fc01bb4593403

7 years agoMove cinder's kestone::auth parameters to API profile
Juan Antonio Osorio Robles [Mon, 8 Aug 2016 10:31:17 +0000 (13:31 +0300)]
Move cinder's kestone::auth parameters to API profile

In the move to composable services, these parameters are not
necessary in the controller, but in the profile itself. They are not
yet in use but will be used to populate the keystone endpoint.

Change-Id: Ib9b0e474f875a4b2ffbda11c01cb882149997b0c

7 years agoMove neutron's kestone::auth parameters to server profile
Juan Antonio Osorio Robles [Mon, 8 Aug 2016 10:21:49 +0000 (13:21 +0300)]
Move neutron's kestone::auth parameters to server profile

In the move to composable services, these parameters are not
necessary in the controller, but in the profile itself. They are not
yet in use but will be used to populate the keystone endpoint.

Change-Id: Ia0866d893c2f3258b0e00efcb8894c7643980173

7 years agoMerge "Update cinder-api with new authtoken parameters"
Jenkins [Mon, 8 Aug 2016 13:54:36 +0000 (13:54 +0000)]
Merge "Update cinder-api with new authtoken parameters"

7 years agoRemove outdated Neutron auth options
Sergey Kolekonov [Mon, 8 Aug 2016 13:08:11 +0000 (16:08 +0300)]
Remove outdated Neutron auth options

Currently Keystone auth plugins should be used to perform authorization.
admin_* parameters as well as identity_uri are deprecated and not needed

Change-Id: I3018932a106df562e94067e037b3bc862be97b51

7 years agoMerge "Convert AllNodesConfig hosts config to a map"
Jenkins [Mon, 8 Aug 2016 12:55:28 +0000 (12:55 +0000)]
Merge "Convert AllNodesConfig hosts config to a map"

7 years agoMerge "Add EnabledServices output to overcloud.yaml"
Jenkins [Mon, 8 Aug 2016 12:51:26 +0000 (12:51 +0000)]
Merge "Add EnabledServices output to overcloud.yaml"

7 years agoMake deployed-server OS::Neutron::Port optional
Dan Prince [Sat, 6 Aug 2016 15:08:05 +0000 (11:08 -0400)]
Make deployed-server OS::Neutron::Port optional

This patch makes it possible to set
OS::TripleO::DeployedServer::ControlPlanePort: OS::Heat::None
in your resource_registry and thereby avoid the creation of
a neutron port for the deployed server. This is useful if
you are bootstrapping things in an environment without
Neutron.

Also, includes a new deployed-server-noop-ctlplane.yaml
environment file.

Change-Id: I2990dc816698e0f6e3193a8fc7c9c6767c6e50e5

7 years agoAdd Sahara services to ControllerServices list
Steven Hardy [Thu, 30 Jun 2016 16:50:28 +0000 (17:50 +0100)]
Add Sahara services to ControllerServices list

https://review.openstack.org/#/c/318840/ decomposed the Sahara services
but they weren't added to the ControllerServices list, thus are now disabled.

Since we shipped mitaka with sahara enabled by default, we should probably add
them so the behavior is consistent when folks upgrade.

This also fixes a couple of issues we missed when landing the initial service
templates (partly because CI didn't test them).

In order for each service to operate independently when used with Pacemaker,
the roles needed to be separated. This commit also does this.

Depends-On: Id61eb15b1e2366f5b73c6e7d47941651e40651b1
Change-Id: I0846b328e9d938275e373d58f0b99219b19b326c
Closes-Bug: #1592284
Co-Authored-By: Brad P. Crochet <brad@redhat.com>
7 years agoDisable mistral services by default.
Carlos Camacho [Mon, 1 Aug 2016 08:34:24 +0000 (10:34 +0200)]
Disable mistral services by default.

Optional services should be disabled by default in the overcloud nodes.
This submission makes mistral disabled by default and allows to enable
it base on an environment file.

Depends-On: I942d419be951651e305d01460f394870c30a9878

Change-Id: I0dd245b75142834f71f3bd591b43c3f69d63217b