Commit Graph

86 Commits

Author SHA1 Message Date
Zuul
ecbe72ba9b Merge "Introduce wait_backoff, fail_if_empty wrappers" 2018-03-02 13:40:49 +00:00
Harald Jensas
d0a03972a6 Use ipaddress module
This patch replaces use of ipaddr python module with
ipaddress module. The ipaddr has been superseded by the
ipaddress module.

Also install python-ipaddress instead of python-ipaddr in
deployed-server bootstrap scripts.

Closes-Bug: #1751934
Change-Id: I63ae89869c8994e17b3460f9ae94e5fa922f6237
2018-02-27 18:01:21 +01:00
Sergii Golovatiuk
fc06a7deba Introduce wait_backoff, fail_if_empty wrappers
* wait_backoff wrapper retries the command several time increasing backoff
  timeout exponentially. Its log is added to to stderr.

* Under some circumstances (race condition), stack may be created but it's
  resources are not. fail_if_empty wrapper fails if no output received.

* Some openstack commands were wrapped as there is a delay between stack and
  resource creations. Usually it's not visible on speedy environments. However,
  when undercloud is located on small VM or cloud flavour is m1.medium then a
  race condition may occur as heat creates stack and its resources
  sequentially. This means there may be cases when stack is created but its
  resources are not. Wrapping openstack calls with wait_backoff and
  fail_if_empty guarantees output with proper exit code

Change-Id: If10f4d58f3689bc7d817c8ac2c31e48501e937ce
2018-02-23 11:21:27 +00:00
Sergii Golovatiuk
961f7315f3 Refactor get-occ-config.sh
* Add $ to to eval hosts to get proper dereference
* Add quatas around eval
* Replace let with ((i++))

Change-Id: I5dbb6ef16598905b6d3bbb9efc448e0b45cbe099
2018-02-20 16:14:14 +01:00
Zuul
e8c37e90a4 Merge "Add subnet property to ctlplane network for server resources" 2018-02-08 01:27:21 +00:00
Harald Jensas
77c82f6645 Add subnet property to ctlplane network for server resources
The subnet property is added to puppet/role.role.j2.yaml as
`{{role}}ControlPlaneSubnet`. Roles with a different subnet specified
can be used to deploy a routed network architecture by using one
role per routed network.

When enabling the neutron segments plug-in to support routed-networks
the neutron IPAM code will defer ipallocation unless the port create
request contain enough details. (Ref: LP Bug: #1695740) By adding the
subnet to port create request this change enables tripleo deployment
on an undercloud with Neutron segments plug-in and routed networks.

This depends on a Heat change that improves network logic in server
resource to not replace the current port if new props match what is
on the current interface. Without this adding the subnet property on
update/upgrades would cause a port replacement, which in turn would
cause IPAM info in undercloud neutron to miss-match the deployed
overcloud nodes.

Depends-On: Iab75ec49b962617943017dcaf1b04b89f91a982e
Change-Id: I33804bfd105a13c25d6057e8414e09957939e8af
Implements: blueprint tripleo-routed-networks-deployment
2018-02-02 09:53:03 +00:00
rajinir
afe81a4e05 Add support for Dell EMC VNX Cinder Backend
This change adds a new define for cinder::backend::dellemc_vnx

Change-Id: I57af2f781c24c74b355410ffb4dc28382ee183fd
Implements: blueprint dellemc-vnx-cinder
2018-01-30 10:57:56 -06:00
Sergii Golovatiuk
d5be6a2722 Introduce wait_backoff, fail_if_empty wrappers
* wait_backoff wrapper retries the command several time increasing backoff
  timeout exponentially. Its log is added to to stderr. All openstack calls were
  refactored to to try several time as services may be restarted during
  installation or upgrade.

* fail_if_empty wrapper fails if no output received.

* Some openstack commands were wrapped as there is a deplay between stack and
  resource creation. Usually it's not visible. However, when undercloud is
  located on small VM or cloud flavour is m1.medium then it creates a race
  condition may occur in some places.

Minor:
- let was replaced to ((i++)), for speed reason.
- sleep was added to while true, just not to abuse openstack services.

Change-Id: I435042e6f7fdfcb38d04b055ba437f273d0bfe75
2018-01-25 15:02:36 +01:00
Alex Schultz
ee4ddada26 Add connection timeout options to ssh
Change-Id: I8047b0bbd672d052a0d4cbe3db549d3f52002280
2018-01-06 15:18:16 +00:00
James Slagle
08641d846a Use StrictHostKeyChecking=no in enable-ssh-admin.sh
Use StrictHostKeyChecking=no to inject the temporary ssh key in
enable-ssh-admin.sh. The user provides the list of hosts for ssh, so we
can safely assume that they intend to ssh to those hosts.

Also, for the ovb case the hosts will have new host ssh keys which have
not yet been accepted.

Change-Id: Ia2a2d1e4c214d9d9190131c280a54eab066e3657
Closes-Bug: #1737027
2017-12-07 14:54:49 -05:00
Carlos Camacho
927495fe3d Change template names to queens
The new master branch should point now to queens instead of pike.

So, HOT templates should specify that they might contain features
for queens release [1]

[1]: https://docs.openstack.org/heat/latest/template_guide/hot_spec.html#queens

Change-Id: I7654d1c59db0c4508a9d7045f452612d22493004
2017-11-23 10:15:32 +01:00
Zuul
b2bc4f36a3 Merge "logging: merge fluentd-client and fluentd-base" 2017-11-22 10:41:19 +00:00
Zuul
a4877d7272 Merge "Removes manila-generic-config from TripleO" 2017-11-21 16:54:11 +00:00
Giulio Fidente
3cea68f12c Deploy Ceph Luminous and add support for CephMgr service
The upgrade of Ceph to Luminous requires a new daemon, ceph-mgr, to be
deployed with every ceph-mon. This submission adds support for the
deployment of ceph-mgr via ceph-ansible.

Change-Id: I4226233d02b70980c6b53518ae2d511b653ce2de
Depends-On: I3645c6c3f68fcefc93fa8699796ba8892aa946c8
Implements: blueprint ceph-luminous
2017-11-20 21:11:23 +01:00
Lars Kellogg-Stedman
f982eb55c4 logging: merge fluentd-client and fluentd-base
The fluentd implementation was originally split across multiple files
in order to support both client and server services. we ultimately
decided to only implement the client as part of tripleo so this
division is no longer necessary.  This commit merges
fluentd-client.yaml and fluentd-base.yaml into fluentd.yaml, and
renames things appropriately.

Partial-bug: #1715187
Depends-On: Iace34b7baae8822d2233d97adabf6ebc8833adab
Change-Id: Idb9886f04d56ffc75a78c4059ff319b58b4acf9f
2017-11-17 11:04:52 +01:00
Pradeep Kilambi
5ebbc81c2a Remove deprecated Telemetry services from roles data
Ceilometer API, Collector and Expirer are removed from upstream,
so lets clean these deprecated services.

Change-Id: Ifd28a3029cd39644833ab0e9fc66efb7b5b67c9d
2017-11-07 12:54:41 +00:00
Zuul
aabc588a68 Merge "Do not rely on openstack-puppet-modules" 2017-10-24 03:55:37 +00:00
Jiri Stransky
b0e72c1413 Create short lived ssh key for enable-ssh-admin.sh
Instead of using the key provided by user on the command line, create
a new short-lived key, give it to Mistral to create a tripleo-admin
user with it, and remove the short-lived key.

Co-Authored-By: John Fulton <fulton@redhat.com>
Change-Id: I6e6ed83fa62319d59d7289b16a1412a340ea6b26
Closes-Bug: #1724578
2017-10-19 11:55:04 +02:00
Emilien Macchi
29f32c4c2c Do not rely on openstack-puppet-modules
We are removing openstack-puppet-modules package since we now have
individual packages for each Puppet module.
We can still rely on puppet-tripleo module to deploy all dependencies.

Change-Id: I5ec13e8db5ae5422da9cb8a59c69c9c6c8f34622
Related-Bug: #1676998
2017-10-17 11:13:03 -07:00
Victoria Martinez de la Cruz
6740f94914 Removes manila-generic-config from TripleO
Generic driver is not intended to be used in real environments
since it introduces a SPOF in the data path. Due to this, it
doesn't make sense and generates confusion to have the environment
file, so in this patch set we simply remove it.

Change-Id: I2e1db2bd614eae65e59712f50dc3391f16f6b388
Closes-Bug: #1708680
2017-10-16 16:54:47 -03:00
James Slagle
6e7a431df0 Remove deprecation handling from custom roles
For deployed-server custom roles, the deprecation handlings are removed.
As these have always been custom roles with definitions generated from
role.role.j2.yaml, these original (now deprecated) param names were
never present for anyone using this deployed-server roles data file.

Specifically, deprecated_server_resource_name is quite troublesome as it
will cause the server resources to get replaced on upgrade as the
resource name changes.

These were all introduced in If4a8388634fb1dcbb47beeabbd3db005abc80d4e,
and this commit removes them.

Change-Id: I1c1267f19db972b55466f4649eda62dd7814b94a
Closes-Bug: #1723177
2017-10-16 12:06:02 -04:00
Zuul
b1786cc1b0 Merge "Config download support for standalone deployments" 2017-10-16 13:46:34 +00:00
Zuul
7b3e9f7d54 Merge "Remove Heat Cloudwatch API" 2017-10-16 09:22:39 +00:00
James Slagle
a0e6d30ca2 Config download support for standalone deployments
Presently, "openstack overcloud config download" does not support all
Deployment resources, only those included in the RoleData and are
natively of type group:ansible.

This patch adds support for also pulling all the deployment data for
OS::Heat::SoftwareDeployment (singular) resources applied to individual
servers of any group type. Those resources are mapped to a new nested
stack via the config-download-environment.yaml environment.

The nested stack has the same interface as a SoftwareDeployment but only
creates a OS::Heat::Value resource. The "config download" code will be
updated in a separate patch to read the deployment data from these Value
resources and apply them via ansible.

The related tripleo-common patch (which depends on this patch) is:
I7d7f6b831b8566390d8f747fb6f45e879b0392ba

implements: blueprint ansible-config-download
Change-Id: Ic2af634403b1ab2924c383035f770453f39a2cd5
2017-10-12 22:34:09 +00:00
Emilien Macchi
0e6c86dc12 Sync deployed-server-roles-data and roles-data
deployed-server-roles-data was out of sync and missing some parameters
introduced in Pike cycle:
This patch syncs the roles_data between 2 files.

Change-Id: If4a8388634fb1dcbb47beeabbd3db005abc80d4e
Closes-Bug: #1723177
2017-10-12 09:40:35 -07:00
Alex Schultz
5c3efe66a4 Remove Heat Cloudwatch API
The heatwatch api has long be deprecated[0] so this should not be in the
roles and environment configuration.

[0]
http://lists.openstack.org/pipermail/openstack-dev/2015-April/061834.html

Change-Id: I322979c34a92565a7dd54248c312b692e9c83f74
Closes-Bug: #1720865
2017-10-11 09:54:38 +02:00
Brent Eagles
94c9c2f954 Add Neutron SR-IOV agent container
This patch adds support for running the neutron SR-IOV agent in a
container.

Depends-On: I4a63845a97c890d7d408731ec5509c320289f18f
Depends-On: Ie5d8cd7863c0d042cc6a4e1fc52602d8a03a1935
Depends-On: I1b5ab0a64ae1f5735f1bd5a68e6ae8bdcf47ddec

Closes-Bug: #1715388

Change-Id: I7ee603b32eddacd02d846dff00dd1b786d4a7ad9
2017-09-06 22:18:24 -02:30
rajinir
f6c9906d51 Add support for Dell EMC Isilon Manila backend
This change adds support for manila::backend::dellemc_isilon

Change-Id: I92592e4b717d4b1812ccd810ec1daaedd181c3dd
Implements: blueprint dellemc-isilon-manila
2017-08-30 04:42:09 +00:00
rajinir
04daabdc84 Add support for Dell EMC VMAX Manila Backend
This change adds support for manila::backend::dellemc_vmax

Change-Id: I92e189c8741c496ef6c27130f73829c327a99f1b
Implements: blueprint dellemc-vmax-manila
2017-08-30 04:42:01 +00:00
rajinir
a3debcfa8b Add support for Dell EMC VNX Manila Backend
This change adds support for manila::backend::dellemc_vnx

Change-Id: I5fa5c2d6956429d1b9c12a5af6d4a887ed0624d9
Implements: blueprint dellemc-vnx-manila
2017-08-22 11:40:23 -05:00
rajinir
c5ee7b7714 Add support for Dell EMC Unity Manila Backend
This change adds support for manila::backend::dellemc_unity

Change-Id: Idec67d190b12359e8e6f1c157577088fa84ef41d
Implements: blueprint dellemc-unity-manila
2017-08-22 11:40:23 -05:00
Jiri Stransky
507bed1da9 Add script to create tripleo-admin on deployed servers
When using deployed servers, we want to create a standard
tripleo-admin user for Mistral's ssh tasks (e.g. running Ansible on
overcloud). This script wraps the respective Mistral workflow.

Change-Id: I2de698b4aae07f74569243a9e7c1c56eb578e700
Related-Bug: #1708180
Depends-On: Ibe8e54f7b38d8c6c8d944d2b13f0eed004c34c4c
2017-08-08 08:07:19 +02:00
Ben Nemec
4502b7cba6 Make RoleParameters and key_name descriptions consistent
The key_name default is ignored because the parameter is used in
some mutually exclusive environments where the default doesn't
need to be the same.

Change-Id: I77c1a1159fae38d03b0e59b80ae6bee491d734d7
Partial-Bug: 1700664
2017-08-02 16:18:25 -05:00
Jenkins
e3f5da81ae Merge "Set name property on missing deployments" 2017-07-24 18:41:06 +00:00
Jenkins
6f9f76748c Merge "Use static environment for deployed-server neutron mappings" 2017-07-24 18:14:22 +00:00
Jenkins
86621ff34a Merge "Add support for nova live/cold-migration with containers" 2017-07-24 15:22:39 +00:00
Oliver Walsh
4a7f3398f1 Add support for nova live/cold-migration with containers
Updates hieradata for changes in https://review.openstack.org/471950.
Creates a new service - NovaMigrationTarget. On baremetal this just configures
live/cold-migration. On docker is includes a container running a second sshd
services on an alternative port.
Configures /var/lib/nova/.ssh/config and mounts in nova-compute and libvirtd
containers.

Change-Id: Ic4b810ff71085b73ccd08c66a3739f94e6c0c427
Implements: blueprint tripleo-cold-migration
Depends-On: I6c04cebd1cf066c79c5b4335011733d32ac208dc
Depends-On: I063a84a8e6da64ae3b09125cfa42e48df69adc12
2017-07-23 02:26:55 +01:00
James Slagle
d90d57a8c3 Use static environment for deployed-server neutron mappings
We can't include these mappings for the deployed-server neutron ports
when using split-stack in the generated environment file because the
path to the actual templates directory is not known from with the
templates themselves.

This patch removes the mappings from the generated environment from the
stack output and adds a static environment file with relative paths that
will have to be included on the deploy command cli instead.

Change-Id: Id4b8c939fa7b26205609819b66e76bf73c9890d0
Closes-Bug: #1705144
2017-07-18 20:01:06 -04:00
James Slagle
c1a4f8d810 Set name property on missing deployments
To be consistent with all other SoftwareDeployment's in
tripleo-heat-templates, this sets the name property on
the deployments where it was missing.

Change-Id: I8bc062d2af93acead240bd5e473ea385b2bf6cf2
2017-07-17 17:17:52 -04:00
Oliver Walsh
8e5bb308cf Refactor iscsi initiator-name reset into separate service
This currently assumes nova-compute and iscsid run in the same context which
isn't true for a containerized deployment

Change-Id: I11232fc412adcc18087928c281ba82546388376e
Depends-On: I91f1ce7625c351745dbadd84b565d55598ea5b59
Depends-On: I0cbb1081ad00b2202c9d913e0e1759c2b95612a5
2017-07-17 13:56:15 +01:00
James Slagle
d0acf56606 Add DeployedServerEnvironmentOutput
Add a new output, DeployedServerEnvionmentOutput, that can be used as
the contents of an environment file to input into a services only stack
when using split-stack. The parameter simplifies the manual steps needed
to deploy split-stack.

By default, the resource that generates the output is mapped to
OS::Heat::None.

implements blueprint split-stack-default
Change-Id: I6004cd3f56778f078a69a20e93a0eba0c574b3db
2017-07-10 09:36:22 -04:00
James Slagle
c47ca9c3a1 Add DeploymentSwiftDataMap parameter
The DeploymentSwiftDataMap parameter is used to set the
deployment_swift_data property on the Server resoures. The parameter is
a map of role names and node indexes to Swift container and object names
to be used for storing deployment data.

The parameter allows for using predefined Swift objects for storing
deployment data instead of container/object names with generated uuid's
from Heat.

implements blueprint split-stack-default
Depends-On: Ia07e9374a4b95bd0e74fc47fb9df4bf6ad096715

Change-Id: I471037de35e7f349d900462ec3ffb16fe2d6ebd9
2017-06-15 14:45:11 -04:00
James Slagle
c8a266d99e Add os-collect-config data as an output
Adds a new output, ServerOsCollectConfigData, which is the
os-collect-config configuration associated with each server resource.
This can be used to [pre]configure the os-collect-config agents on
deployed-server's.

Having the data available as a stack output is more user friendly than
having to query several nested levels of stack resources, and then
inspect resource metadata.

implements blueprint split-stack-default
Change-Id: Iaf062f1a72e2a9e4d97f84c67f72408a6b5cebfc
Depends-On: I8acfd67cd8138d587cc362184c84a08134bf3157
2017-06-15 14:43:11 -04:00
Carlos Camacho
0a0e2ee629 Update the template_version alias for all the templates to pike.
Master is now the development branch for pike
changing the release alias name.

Change-Id: I938e4a983e361aefcaa0bd9a4226c296c5823127
2017-05-19 09:58:07 +02:00
James Slagle
e17590c69e Add $STACK_NAME input var
The stack name can now be overridden in the get-occ-config.sh script for
deployed-server's by setting the $STACK_NAME variable in the
environment.

Change-Id: Iecba21499b80e463b4c629be53c309996d39472d
Closes-Bug: #1686719
2017-04-27 13:02:57 -04:00
Jenkins
d33948a45b Merge "Add missing name properties on deloyment resources" 2017-04-11 22:22:14 +00:00
Giulio Fidente
b5b6681a74 Replace references to the 192.0.2 network
Following change I1393d65ffb20b1396ff068def237418958ed3289 the ctlplane
network will be 192.168.24 by default and not 192.0.2 anymore.

This change removes old references left to 192.0.2 network from the
overcloud templates.

Change-Id: I1986721d339887741038b6cd050a46171a4d8022
2017-04-10 14:05:50 +02:00
Steve Baker
5e934cd9b8 Use the local collector to bootstrap deployed servers
os-collect-config is already configured to use json files in
/var/lib/os-collect-config/local-data/ as a data source, so this can
be used in the deployed-server get-occ-config.sh to copy in the
required json to generate the required os-collect-config.conf.

Co-Authored-By: James Slagle <jslagle@redhat.com>
Closes-Bug: #1679705
Change-Id: Ibde9e6bf360277d4ff64f66d637a5c7f0360e754
2017-04-04 22:31:58 -04:00
James Slagle
a216934f40 Purge initial firewall for deployed-server's
We need to purge the initial firewall for deployed-server's, otherwise
if you have a default REJECT rule, the pacemaker cluster will fail to
initialize. This matches the behavior done when using images, see:
Iddc21316a1a3d42a1a43cbb4b9c178adba8f8db3
I0dee5ff045fbfe7b55d078583e16b107eec534aa

Change-Id: Ia83d17b609e4f737074482a980689cc57c3ad911
Closes-Bug: #1679234
2017-04-03 12:52:45 -04:00
James Slagle
04097e8b40 Add missing name properties on deloyment resources
Adds some missing name properties on deployment resources where they
were lacking. It's convention in TripleO that all the deployment
resources have the name property set.

Change-Id: I6464b099e725f8469163c887676d56d769e2f9b1
2017-04-01 01:30:35 +00:00