194 Commits

Author SHA1 Message Date
Harald Jensås
f7a359cd0e Merge new params - nic-config templates
Utility script to merge new parameters into existing nic-config
templates. Uses process-templates.py rendered 'single-nic-vlans'
templates as reference and appends any parameters that is not
already present in the existing NIC template.

New NIC template parameters were introduced in:
  https://review.openstack.org/#/c/580236/

When upgrading the existing NIC templates have to have these
new parameters merged.

Change-Id: I474e57878212d2cb7c2b392a5fdf4e449f783a66
2018-10-23 19:59:37 +02:00
Zuul
1bd8888d79 Merge "Rename no-tls environment" 2018-10-20 02:03:33 +00:00
Zuul
58f6604f47 Merge "Remove unused tls-cert-inject.yaml template" 2018-10-17 11:56:50 +00:00
Steven Hardy
b278f6c476 Remove unused tls-cert-inject.yaml template
This is no longer handled as the TLS handling tasks were converted
to ansible, and in the context of this series we need to remove it
because it references bootstrap_nodeid

Partial-Bug: #1792613
Change-Id: Ib32177b116f148f007574847320566e32240cf96
2018-10-12 11:12:25 +01:00
Juan Antonio Osorio Robles
3ecbf827ec Rename no-tls environment
It was using a wrong name, which came by accident since it was
introduced to the sample environment generator.

Change-Id: I154af6d0b7ebf5cd339d5d06eaaf9b1ab66814b0
Related-Bug: #1796022
2018-10-12 11:16:35 +03:00
Juan Antonio Osorio Robles
cb3c72f37d Remove references to logging_source
This has been unused for a while, and even deprecation was scheduled
(although the patch never merged [1]). So, in order to stop folks
getting confused with this, it's being removed.

[1] https://review.openstack.org/#/c/543871/

Change-Id: Iada64874432146ef311682f26af5990469790ed2
2018-10-08 13:43:47 +03:00
Bob Fournier
47f47c1dea In process-templates script write output files to provided dir when using base path
When running the process-templates script with both the -o OUTPUT_DIR and
-p BASE_PATH options the output files were not being written to the output
directory.  This fix splits out the file path from the base path to properly
write the files.

Change-Id: I845e8a2cbd2b12a4a1552b2cfa3ac013466da6bd
Closes-Bug: #1794769
2018-09-28 15:06:44 +02:00
Juan Antonio Osorio Robles
90234f4f2a Remove references to logging_group
This has been unused for a while, and even deprecation was scheduled
(although the patch never merged [1]). So, in order to stop folks
getting confused with this, it's being removed.

[1] https://review.openstack.org/#/c/543871/

Change-Id: Icc6b51044ccc826f5b629eb1abd3342813ed84c0
2018-08-29 13:43:30 +03:00
Zuul
5100f950ef Merge "Fix logic around heat output exclusions handling" 2018-08-20 19:26:42 +00:00
Zuul
5fadfd093f Merge "Add host routes to subnets" 2018-08-14 19:40:21 +00:00
James Slagle
5710f5b35f Fix logic around heat output exclusions handling
The logic in the validation was incorrect in that it would actually
error (return 1) if args.quiet >= 2, even though the file was excluded.

This commit fixes that bug, as well as improves the message around
excluded files, which should not be a warning, only informative.

Change-Id: I2cd8cd84a7ebb952e3c39f99a460177b9be9c2e1
2018-08-13 14:15:07 -04:00
Jiri Stransky
6364f2286c Update and upgrade tasks for services deployed via external deploy tasks
Composable service templates can now define external_update_tasks and
external_upgrade_tasks. They are meant for update/upgrade logic of
services deployed via external_deploy_tasks. The external update
playbook first executes external_update_tasks and then
external_deploy_tasks, the procedure for upgrades works
analogously. All happens within a single playbook, so variables or
fact overrides exported from the update/upgrade tasks will be
available to the deploy tasks during the update/upgrade procedure.

Partial-Bug: #1783949
Change-Id: Ib2474e8f69711cd6610a78884d5032ffd19ad249
2018-08-02 15:04:15 +02:00
Martin Mágr
b76d7623ac QDR for metrics collection purposes
This patch adds composable new service (QDR) for containerized deployments.
Metrics QDR will run on each overcloud node in 'edge' mode. This basically
means that there is a possibility that there will be two QDRs running
on controllers in case that oslo messaging is deployed. This is a reason why
we need separate composable service for this use case.

Depends-On: If9e3658d304c3071f53ecb1c42796d2603875fcd
Depends-On: I68f39b6bda02ba3920f2ab1cf2df0bd54ad7453f
Depends-On: I73f988d05840eca44949f13f248f86d094a57c46
Change-Id: I1353020f874b348afd98e7ed3832033f85a5267f
2018-07-31 21:55:45 +00:00
Harald Jensås
4e44547533 Add host routes to subnets
This change adds a new routes field to the network
definition in network_data.yaml. This field contains
a list of network routes in JSON, e.g.
  [{'destination':'10.0.0.0/16','nexthop':'10.0.0.1'}].

This list is used to set the ``host_routes`` property
of each networks subnet.

Co-Authored-By: Dan Sneddon <dsneddon@redhat.com>
Partial: blueprint tripleo-routed-networks-templates
Depends-On: Ifc5aad7a154c33488a7613c8ee038c92ee6cb1a7
Change-Id: I33b34f1445f4203fbf25edeb093b37c7494c664f
2018-07-30 09:42:19 +02:00
Cédric Jeanneret
d37308d63c Fix python3 support in yaml-validate script.
Python3 drops the "iteritems" method for dict in favor to
"items".

Change-Id: I8d21233e917b5d36be385d59f1a7c9a0588aea2d
Closes-Bug: 1783988
2018-07-27 15:20:32 +02:00
Zuul
87c03bf6b8 Merge "Add a ComputePPC64LE role" 2018-07-23 00:33:07 +00:00
Zuul
8666a73d68 Merge "Remove the OVS-DPDK deprecated parameters" 2018-07-09 23:03:32 +00:00
Zuul
20de1eb34d Merge "yaml-validator - network_data validate show all errors" 2018-07-09 21:50:28 +00:00
Tony Breeds
40282174ea Add a ComputePPC64LE role
Create a new role for compute nodes running on ppc64le.  Ideally we
wouldn't need this but at least the overcloud image needs to differ
based on CPU architecture so having a separate role allows us to vary
other parameters.

As the intent is for the same services to run on moth Compute and
ComputePPC64LE add a validation check to ensure that the services stay
in sync.

Blueprint: multiarch-support
Change-Id: I9912139048fa11df447c0985e7d53fbcfee7e252
2018-07-08 08:49:34 +10:00
Zuul
a8393fa8a4 Merge "Handle roles w/o deprecated_nic_config_name during template cleanup" 2018-07-05 10:54:45 +00:00
Harald Jensås
b9f185c607 yaml-validator - network_data validate show all errors
Instead of exiting on the first error, set the return
value to 1 whenever an error is found and continue
validating the file. By doing this all errors are made
visible with a single run.

Change-Id: I0ecccf3113eeb511b77c447edce0c317f7642f80
2018-07-05 00:08:24 +02:00
Bob Fournier
f997e3da60 Handle blank lines followed by comment in nic conversion script
Currently if a blank line is followed by a comment the 'last_non_comment_spaces'
variable gets reset, which results in the comment line not being indented.
This just ignores blank lines so that 'last_non_comment_spaces' isn't reset
and the comment line is properly indented.

Closes-Bug: 1779191
Change-Id: I286da578c42df24242ba38df12d42c8a8fdd4a4f
2018-06-29 08:02:12 +00:00
Zuul
c7b10fe834 Merge "Fail yaml-validate.py on new deployments with outputs" 2018-06-28 06:16:06 +00:00
Zuul
ca5bc5f50e Merge "Add option to override confirmation in yaml-nic-config-2-script.py" 2018-06-27 10:50:50 +00:00
Saravanan KR
58b6034b24 Remove the OVS-DPDK deprecated parameters
Few of the OVS-DPDK prameteres has been deprecated in the
pike release, which are not required anymore. Removed those
parameters from the templates.

Change-Id: Iabb8002a9eb69321aa2d4aefac012dbe09dc80a6
2018-06-27 14:26:12 +05:30
James Slagle
fdeabe06e7 Handle roles w/o deprecated_nic_config_name during template cleanup
Don't assume the role dict has a deprecated_nic_config_name key during
cleanup of the process templates. This isn't a required field, so we
can't assume it exists, otherwise the script will traceback with a
KeyError.

Change-Id: I50eb4831c2b413e2253cb0c3dc9aba4c719f0f14
2018-06-20 15:27:17 -04:00
baiwenteng
66b8d58ee8 Fix typo
replace "configuation" with "configuration"
replace "assigment" with "assignment"

Change-Id: Icd4735ffbdea14997557f8db0566cb190027101b
2018-06-12 11:51:24 +08:00
James Slagle
82df65cdcc Fail yaml-validate.py on new deployments with outputs
Elevates the warning from yaml-validate.py about Heat deployment outputs
to an error now that config-download is the default. An exclusions list
is added to exclude those existing templates that use outputs, which
will be cleaned up in the Stein release.

Change-Id: I7249df36cb9391d8577432920a9bd33361a58f92
2018-06-04 16:02:38 -04:00
Zuul
161156d750 Merge "NFV: Support for config-download to deploy node with kernel args" 2018-05-29 18:52:58 +00:00
Cédric Jeanneret
3848713182 Correct log location in container environment for Fluentd
Since we moved services in containers, their logs aren't in the old location, but
in /var/log/containers/<service>. This patch fixes the generated Hiera hash used
by Fluentd for its configuration

Regarding Designate config service: some of the yaml doesn't use at all the
`service_config_settings` parameter - they will need to be updated accordingly
once it's supported

Co-Authored-By: Thomas Herve <therve@redhat.com>, Steven Hardy <shardy@redhat.com>
Change-Id: I1bc0930de4053dc1c34b50477e82d9ccdab7ae2e
Closes-Bug: 1769051
Related-Bug: 1674715
2018-05-18 10:18:43 +02:00
Saravanan KR
a3e4a90636 NFV: Support for config-download to deploy node with kernel args
For NFV deployments, specific kernel args should be applied and
the nodes should be restarted before running the NetworkDeployment.
It is supported in the heat deployment via PreNetworkConfig. In the
config-download mechanism, ansible steps need to be improved
to handle the reboot and wait for the node.

Change-Id: I43b383ad0e04b8be6c321f8c5b05e628b2520141
2018-05-15 11:01:06 +05:30
Zuul
a189f37216 Merge "yaml-validate: sets isn't python3" 2018-05-14 23:16:57 +00:00
Marius Cornea
553554ad72 Add option to override confirmation in yaml-nic-config-2-script.py
This change adds the option to override the user input confirmation
to overwrite the nic template file. This is required when the script
is used inside automated jobs.

Closes-bug: 1770296

Change-Id: Ic8275bb3a944e503c73ab06c3d5140ea3563c0a6
2018-05-09 21:52:14 -04:00
Emilien Macchi
af7a4ab5b8 yaml-validate: sets isn't python3
Run builtin "set" instead of python2 Sets module.

Change-Id: I2f3db189b23e5578f2f02a3a7189a7aa8323acb6
2018-05-09 15:42:43 +00:00
Carlos Camacho
44ef2a3ec1 Change template names to rocky
The new master branch should point now to rocky.

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

Also, this submission updates the yaml validation to use only latest
heat_version alias. There are cases in which we will need to set
the version for specific templates i.e. mixed versions, so there
is added a variable to assign specific templates to specific heat_version
aliases, avoiding the introductions of error by bulk replacing the
the old version in new releases.

[1]: https://docs.openstack.org/heat/latest/template_guide/hot_spec.html#rocky
Change-Id: Ib17526d9cc453516d99d4659ee5fa51a5aa7fb4b
2018-05-09 08:28:42 +02:00
Zuul
6fe62ce661 Merge "Fix sample env data" 2018-05-02 20:18:27 +00:00
Zuul
e24316c4ec Merge "Ensure tasks aren't empty dicts" 2018-05-02 05:05:47 +00:00
Alex Schultz
03c8cbcdc2 Fix sample env data
I934561612d26befd88a9053262836b47bdf4efb0 renamed the rabbit ssl
parameters that we use in the same environment generate but since the
script did not fail, it made it past CI. This change fixes the
RabbitClientUseSsl parameter in the environment to match the new
RpcUseSsl flag and updates the check script to fail if this happens
again.

Change-Id: I47c63875c6934bca2903883787467fc1804ba5da
Closes-Bug: #1768358
2018-05-01 16:05:02 -06:00
Alex Schultz
960fc05b8a Ensure tasks aren't empty dicts
Ansible doesn't like it when tasks are empty dicts so let's make sure
we aren't passing an empty dict in to the ansible tasks. Unfortunately
since we're validating non-heat processed yaml, the list_concats end
up being dicts to the yaml validator so we can't just ensure they are
always lists.

Change-Id: I13dcc4f3d4ea2ac4c7ab62887dfea293246f6530
Related-Bug: #1768019
2018-05-01 15:52:55 -06:00
Emilien Macchi
88bfa38ae5 undercloud-upgrade: use deploy_steps_tasks for yum update
Use deploy_steps_tasks instead of external_deploy_tasks so we execute
the playbook on nodes that match "overcloud" group, which is the case of
the containerized undercloud.

Also add deploy_steps_tasks to tools/yaml-validate.py part of
OPTIONAL_DOCKER_SECTIONS.

Change-Id: Iaa6a05bf864cdb54a000ef74e6c5ab8e627ab0cf
2018-04-30 16:38:32 -07:00
Zuul
5e0775a1ca Merge "Restrict tenant network to geneve" 2018-04-28 10:23:16 +00:00
Zuul
f4fa117cc7 Merge "Add dry-run mode for process templates" 2018-04-27 12:54:37 +00:00
venkata anil
ae4aac8cb5 Restrict tenant network to geneve
OVN doesn't support VXLAN networks. VLAN tenant networks
have limitations and should be blocked till they are fixed.
So we restrict tenant network to geneve.

Change-Id: I4cabde39c252a605d769e137ae402f6fbc5a3041
Closes-Bug: 1767070
2018-04-27 15:40:03 +05:30
Zuul
c71ffb5740 Merge "Add validation on role names" 2018-04-26 09:58:53 +00:00
Zuul
80b12bcbe9 Merge "Move remnants of environments/services-docker" 2018-04-25 18:23:02 +00:00
Dan Prince
3b56c9e501 Add validation on role names
Also, fixes role templates that weren't passing this new validation.

Closes-bug: #1756346

Change-Id: I387386a0d7cf47fe11f24a68b9f2bb2ee2f0b7bd
2018-04-25 15:42:22 +00:00
Zuul
1bec57e977 Merge "Add validation for SoftwareConfig outputs" 2018-04-25 08:44:14 +00:00
Zuul
822bd996b3 Merge "Support separate oslo.messaging services for RPC and Notification" 2018-04-25 04:43:46 +00:00
Zuul
f9a4653f03 Merge "Fail validation on new workflow_tasks" 2018-04-24 14:41:40 +00:00
Zuul
f05507195b Merge "Suppress warnings with -qq" 2018-04-24 14:41:38 +00:00