7878 Commits

Author SHA1 Message Date
Harald Jensås
19381ecffb EC2MetadatIp using get_attr
The route to metadata service is set up in host_routes
of ctlplane subnets by extraconf post deploy::
  extraconfig/post_deploy/undercloud_ctlplane_network.py

Use get_attr on the server resource to resolve attribute
value from the subnet(s) and pass it to the parameter
'EC2MetadatIp' used in the THT/network/config/* templates.

Changes the default for 'EC2MetadatIp' to ''.
Removes the comment that the value should be overriden in
parameters_defaults. It also removes the parameter from
network-environment templates.

A conditinal is used in  puppet/role.role.j2.yaml so that
the parameter value is used whenever it is not '' (the
default) to provide backwards compatibility in case the
user set a different value for this parameter in
network-environment.yaml.

When deploying a routed control plane the network config
templates would previously need to be updated to carry
'EC2MetadatIpLeafX' parameters for each leaf.  By getting
the value to pass from the server resource this change
reduces the required nic-config template customisation.
(Reduces the risk of user error.)

Partial: blueprint tripleo-routed-networks-templates
Change-Id: I9c019ec840a44ca8c5f98be55daea365bc6554ec
2018-07-14 09:18:58 +02:00
Harald Jensås
c649cf0545 ControlPlaneDefaultRoute using get_attr
Use get_attr on the server resource to resolve attribute
value from the subnet(s) and pass it to the parameter
'ControlPlaneDefaultRoute' used in the THT/network/config/*
templates.

Changes the default for 'ControlPlaneDefaultRoute' to ''
as well as the comment that the value should be overriden
in parameters_defaults. It also removes the parameter from
network-environment templates.

A conditinal is used in  puppet/role.role.j2.yaml so that
the parameter value is used whenever it is not '' (the
default) to provide backwards compatibility in case the
user set a different value (different from the one used in
undercloud.conf) for this parameter in
network-environment.yaml.

When deploying a routed control plane the network config
templates would previously need to be updated to carry
'ControlPlaneXDefaultRoute' parameters for each leaf. With
8 Leafs in addition to the network local to the undercloud
that is 8 parameters less to place in the configuration.
By getting the value to pass from the server resource this
change reduces the required nic-config template
customisation (reduces the risk of user error).

Partial: blueprint tripleo-routed-networks-templates
Change-Id: I5139249d55e9ac01761c270b8c0f31ef35595940
2018-07-14 09:11:39 +02:00
Harald Jensås
6ab86a3ebe ControlPlaneSubnetCidr using get_attr
Use get_attr on the server resource to resolve attribute
value from the subnet(s) and pass it to the parameter
'ControlPlaneSubnetCidr' used in the THT/network/config/*
templates.

As the value is now resolved from resource attributes,
this changes the default for 'ControlPlaneSubnetCidr' to ''
as well as the comment that these value should be overriden
in parameters_defaults. It also removes the parameter from
network-environment templates.

A conditinal is used in  puppet/role.role.j2.yaml so that
the parameter value is used whenever it is not '' (the
default) to provide backwards compatibility in case the user
set a different value (different from the one used in
undercloud.conf) for this parameter in
network-environment.yaml.

When deploying a routed control plane the network config
templates would previously need to be updated to carry
'ControlPlaneXSubnetCidr' parameter (in case the subnet
mask is not the same for all the routed network leafs).
With 8 Leafs in addition to the network local to the
undercloud that is 8 parameters less to place in the
configuration. By getting the value to pass from the
server resource this change reduces the required nic-config
template customisation (reduces the risk of user error).

Partial: blueprint tripleo-routed-networks-templates
Change-Id: I92ee0f9a2107cdf1ca5903d3756a235a79c36c73
2018-07-14 09:11:28 +02:00
Zuul
70f94be2e5 Merge "Iterate once in network-environment.yaml" 2018-07-14 02:36:25 +00:00
Zuul
7ca6037499 Merge "Clean up env files for Cinder's Netapp backend" 2018-07-14 02:36:19 +00:00
Zuul
e120a5e42b Merge "ceilometer: deprecation cleanup" 2018-07-13 14:51:43 +00:00
Zuul
8b5c41f74f Merge "Increase the step for gnocchi_db_sync" 2018-07-13 13:11:37 +00:00
Zuul
5c2205e779 Merge "Update yaml files for Dell EMC VNX, Unity drivers" 2018-07-13 12:30:33 +00:00
Harald Jensås
4564109600 Iterate once in network-environment.yaml
This replaced multiple for loops with a single loop.
This changes the ordering in the rendered file to have
one section per network, instead of one section per
perameter such as VLAN, AllocationPools.

It also reduces the use of jinja conditionals. This
results in some duplicated comment strings in the
jinja template.

This is a micro optimization, but this makes sense
as a follow on will add the possibility to add
multiple subnets on each network in network_data.yaml.
I.e we avoid additional nested loops over the subnets.

Related: blueprint tripleo-routed-networks-templates
Change-Id: I0f11acaf7c25ff5d240db1daae2dc2b051c0a3b2
2018-07-13 08:40:12 +02:00
Zuul
445d45384e Merge "Generate and mount wrappers for haproxy in OVN metadata agent" 2018-07-13 06:09:13 +00:00
Zuul
11e8aff0f0 Merge "Fix variables interpolation for included roles" 2018-07-13 06:09:11 +00:00
Zuul
1f7062b0ef Merge "Add blankline for readability" 2018-07-13 06:09:09 +00:00
Zuul
5d47f34bb0 Merge "Add FFU upgrade steps to Sahara services" 2018-07-13 00:13:22 +00:00
Sergii Golovatiuk
67489e63f0 Increase the step for gnocchi_db_sync
swift-proxy and gnocchi both run on step_4. However, swift_proxy should
be ready before gnocchi. This patch moves gnocchi_db_sync to step_5 to
be sure that swift-proxy is started before gnocchi. gnocchi_db_sync has
higher start_order to start before other gnocchi services.

Change-Id: I0044c78c4a6d751fc9d0cf6b54ed634032933934
Closes-Bug: 1781162
2018-07-12 23:51:31 +01:00
Zuul
beeda14b65 Merge "Add ServerDeletionPolicy parameter" 2018-07-12 14:59:03 +00:00
Zuul
f713cb7308 Merge "Increase max heat stack depth" 2018-07-12 12:19:35 +00:00
Zuul
43154d8a47 Merge "Remove step_config from NVMEoF cinder backend" 2018-07-12 09:08:44 +00:00
Zuul
dda5f34265 Merge "Replace raw_get with dict access syntax" 2018-07-12 04:25:32 +00:00
Zuul
6118dec096 Merge "HA support for OpenShift" 2018-07-12 04:25:29 +00:00
Hamdy Khader
dbdde60ebc Remove step_config from NVMEoF cinder backend
Change-Id: I84d6d3eacf5b9458fadbeda88663eb2099f42ff0
Related-Bug: #1768063
2018-07-11 14:38:35 +00:00
Martin Mágr
c5b2d08c40 Disable sensu-client in CI
After CI scenario deployment is finished the container ends in unhealthy
state because sensu-client is not successfully connected to RabbitMQ.
We will need to implement default connection to overcloud RabbitMQ instance
for the service to have this service deployed in CI job.

Change-Id: I1aec0c71a945c06a6d914638b45cae074288a90d
Closes-Bug: #1781108
2018-07-11 16:33:21 +02:00
Daniel Alvarez
662814ed1c Generate and mount wrappers for haproxy in OVN metadata agent
OVN metadata agent uses haproxy as part of its implementation.
Running it in a separate container prevents dataplane breakages
(ie. restarting VMs or spawning new ones) on agent restart/stop.
This patch triggers the creation of such sidecar container and
mounting of haproxy wrapper for spawning it in a separate
container.

Change-Id: I59e08384080cda0b6c0f03c9ed8fb6f6a5661e6b
Related-Bug: #1749209
Signed-off-by: Daniel Alvarez <dalvarez@redhat.com>
2018-07-11 14:03:22 +00:00
Bogdan Dobrelya
5a70af7bc3 Fix variables interpolation for included roles
w/a https://github.com/ansible/ansible/issues/42621
Include ansible-role-container-registry roles/tasks
with handlers having the right variables scope.

Closes-Bug: #1781198
Change-Id: I26cc07aa05912c3e84d59003686eae210e924a16
Signed-off-by: Bogdan Dobrelya <bdobreli@redhat.com>
2018-07-11 15:35:04 +03:00
Flavio Percoco
99e933c7aa Replace raw_get with dict access syntax
We used `raw_get` because of a bug we found in ansible a while back.
This doesn't seem to be a problem anymore so we're switching back to
subscript syntax to remove a bit of boilerplate.

Change-Id: Ib5873ca617fbe38ffc6bc4d52cb4c936a94472c5
2018-07-11 07:42:01 +02:00
Flavio Percoco
99b8119d98 HA support for OpenShift
The OSA assisted HA deployment is not recommended for production
environments, besides it being limited. Therefore, we're relying on our
deployment of HAproxy + Keepalived to provide HA on top of OpenShift in
addition to adding more OpenShift nodes.

Depends-On: Ib573758b515264d1dda90cc9de61f4fa6659dc7d

Change-Id: I7ab677e4803e9df5f6641204cb0b6ccc5b1eb79f
2018-07-11 07:41:51 +02:00
Zuul
bb99c7a9b6 Merge "Leave undercloud images locally after prepare" 2018-07-11 03:30:01 +00:00
Zuul
9a49791d1e Merge "standalone run a post config to generate a clouds.yaml" 2018-07-11 00:19:32 +00:00
Zuul
79db8701e4 Merge "Update standalone role for a cloud" 2018-07-11 00:19:30 +00:00
Zuul
65795c744a Merge "Remove unuseful become: true from deploy-steps" 2018-07-11 00:03:10 +00:00
Zuul
d2994ca593 Merge "Replace deprecated include module with include/import_tasks module" 2018-07-10 20:09:42 +00:00
Zuul
44846eb9ee Merge "Add the ability to scaleup the openshift stack" 2018-07-10 20:03:27 +00:00
Zuul
77ca4b1c5a Merge "Correct unit file name check for heat_api_cfn validation." 2018-07-10 14:45:50 +00:00
Zuul
8d7525fdf7 Merge "FFU Create cell0 db points to the nova-api bootstrap node." 2018-07-10 11:54:56 +00:00
Zuul
7f146a1e46 Merge "Cleanup hosts name on initial install" 2018-07-10 08:13:40 +00:00
Zuul
a356b336fe Merge "Add support for {{role.name}}IPs in Composable Role" 2018-07-10 01:57:46 +00:00
Zuul
042422b220 Merge "Call validations upload workflow instead of action" 2018-07-10 01:03:38 +00:00
Zuul
c9ca23dfb1 Merge "Enable libvirt health check" 2018-07-10 01:03:36 +00:00
Zuul
8666a73d68 Merge "Remove the OVS-DPDK deprecated parameters" 2018-07-09 23:03:32 +00:00
Yong Huang
5c09e67473 Update yaml files for Dell EMC VNX, Unity drivers
1. manila-backend-vnx.yaml:
  a. remove ManilaVNXServerMetaPool since meta_pool is not used by Manila VNX driver
  b. add ManilaVNXServerContainer

2. cinder-dellemc-vnx-config.yaml:
  a. remove default value of CinderDellEMCVNXStorageSecurityFileDir since it is not medatory option for Cinder VNX driver

Change-Id: Ie48cec52df720f3a13700d6048ecf78ba9067b51
Closes-bug: #1774942
2018-07-09 22:15:16 +00:00
Zuul
20de1eb34d Merge "yaml-validator - network_data validate show all errors" 2018-07-09 21:50:28 +00:00
Zuul
9c756df12a Merge "FFU: missing ironic tasks" 2018-07-09 21:50:25 +00:00
Zuul
7398894e34 Merge "skydive external_deploy_task migration" 2018-07-09 21:50:22 +00:00
Emilien Macchi
2a9fc8db79 standalone run a post config to generate a clouds.yaml
Implement a post script for the standalone to generate a basic
clouds.yaml for use with various tools.  This one does not reuse the
undercloud post because the undercloud script performs a bunch of
undercloud specific functions.

Change-Id: I0496f4dd2026ab6c705683126c8f50302a0861b9
2018-07-09 21:06:48 +00:00
Alex Schultz
526f39517b Update standalone role for a cloud
Update the standalone role to include compute and other OpenStack
services. This list can be used to deploy a standalone all-in-one
nova/neutron/cinder/glance node.

Depends-On: I796a192b46c3372bebb41096c1051f01445b7e57
Depends-On: If55cf8f90ee7be4acd40fda1f72bb1f31d218b57
Change-Id: I6713469bfbd4fe9fc47d3cb2d3571fe10871f34e
Related-Blueprint: all-in-one
2018-07-09 21:06:41 +00:00
Alex Schultz
e34cfb63d9 Cleanup hosts name on initial install
When we initially install our heat hosts configuration, we need to make
sure the short hostname for the host is not currently defined within the
hosts file as it will conflict with our definitions later in the file.

We only do this on initial installation as we don't want to touch the
file after the initial deployment outside of the matching host entries.
This also is restricted to just the short hostname which is consumed via
the configuration management for determining bootstrap configurations as
well as used by some services during startup (rabbitmq)

Change-Id: If55cf8f90ee7be4acd40fda1f72bb1f31d218b57
Related-Blueprint: all-in-one
2018-07-09 15:02:08 -06:00
Carlos Camacho
00ed1a2d39 FFU Create cell0 db points to the nova-api bootstrap node.
In case the nova-api service is not running in the MySQL
master node, the FFU tasks will fail as it might not have
MySQL installed.

Avoid executing Nova DB tasks on FFU if MySQL not installed,
point to the MySQL server.

Resolves: rhbz#1593910
Closes-bug: 1780425

Change-Id: I02bc48d535707d579ecd590f970b1a08962a0111
2018-07-09 16:22:26 +02:00
Steve Baker
cabaf85adc Leave undercloud images locally after prepare
This saves some time in undercloud deployment, because those images
don't have to be pulled from the undercloud registry.

This change also adds a --verbose so the output is more useful.

Change-Id: I8064d51bed9f3133a8192e9c1a7870f6bb69e2ab
Depends-On: Id75d5288c308e58143662703da3dddbdbcb0cdd9
2018-07-09 13:18:14 +00:00
Flavio Percoco
45f5361391 Add the ability to scaleup the openshift stack
Refactored the inventory generation to allow for scaling up the
openshift stack. They deployment process now checks whether the
origin-node container is already running in the openshift nodes. All
the nodes where origin-node is not present are considered as new.

The new_masters/new_nodes sections will be populated accordingly and
the `scaleup.yml` playbook will be used instead of the `deploy_cluster`
one *only* if the stack is being updated.

Unfortunately, openshift-ansible's implementation is not as idempotent
as TripleO's, which requires differentiating between deployments,
scaleup and between new and old nodes.

Change-Id: I15c4e855a3ccfba6ce8d516b5b59e7508c4885cc
2018-07-09 14:53:35 +02:00
Zuul
66872cc8d9 Merge "Add subnet host_routes to output of OS::TripleO::*::Ports::Port" 2018-07-09 11:24:33 +00:00
Tom Barron
25f93efd8c Fix bootstrap_host_exec check for manila_share
The hiera check for bootstrap node was using 'manila-share'
for service name, which returns nil.  Changing the service
name to 'manila_share', the hiera lookup for
'manila_share_short_bootstrap_node_name' succeeds.

Change-Id: Id3c001f8f0ee9dc156f22a027f66516d6812f51a
2018-07-08 05:11:58 -04:00