22 Commits

Author SHA1 Message Date
Zuul
aa624468b5 Merge "Move cellv2 discovery from control plane services to compute services" 2019-01-18 10:27:02 +00:00
Harald Jensås
a017ecac9f Fall back public_virtual_ip to ctlplane if External net not present
public_virtual_ip previously required the External network to be
present in networks data. Add a conditional to use the VIP on the
ctlplane if the External network is not in networks data.

Closes-Bug: #1774401
Change-Id: Ie6c3d7124d11ee89788b432da39df16f031fcf12
2019-01-09 11:49:14 +01:00
Harald Jensås
868c7685f1 Only add internal_api_virtual_ip if InternalApi in network_data
Add's a conditional to only include internal_api_virtual_ip if
InternalApi network is defined in custom networks.

According to code comment internal_api_virtual_ip is only used
by Contrail.

Change-Id: Ifd8f59bd03c9bab1283e580a64957f201eb8f335
Closes-Bug: #1772124
2019-01-09 11:49:07 +01:00
Zuul
98ac59b933 Merge "Introduce container_cli hiera key" 2019-01-03 19:03:14 +00:00
Oliver Walsh
e0e885b8ca Move cellv2 discovery from control plane services to compute services
If compute nodes are deployed without deploying/updating the controllers then
the computes will not have cellv2 mappings as this is run in the controller
deploy steps (nova-api).
This can happen if the controller nodes are blacklisted during a compute scale
out. It's also likely to be an issue going forward if the deployment is staged
(e.g split control plane).

This change moves the cell_v2 discovery logic to the nova-compute/nova-ironic
deploy step.

Closes-bug: 1786961
Change-Id: I12a02f636f31985bc1b71bff5b744d346286a95f
2018-12-20 11:23:06 +05:30
Rabi Mishra
c2aeb45e38 Replace confusing usage of update_identifier
We use update_identifier ansible variable to check if we need to
re-run deployment tasks. Though there is no bug as we use
DeployIdentifier heat param for it, it's little confusing
(UpdateIdentifier was meant for package updates).

This also removes usage of UpdateIdentifier/update_identifier in
all_nodes_config.j2.yaml. We can deprecate/remove the heat param in a
subsequent patch.

Change-Id: I36ed62ae605a2d8f8f139b50646144b143d5e5f4
2018-12-12 09:25:00 +05:30
Juan Antonio Osorio Robles
aaad5025e2 Introduce container_cli hiera key
This hiera key is useful for when scripts want to figure out what tool
to call. This way they only need to call hiera in order to figure that
out.

Change-Id: I63dfd339a68ee1730e84cdcc32856f2fb4590cf4
2018-12-07 08:13:02 +00:00
Steven Hardy
a77d045663 Add SERVICE_bootstrap_node_ip values to allNodesConfig
This can be used to replace the per-role bootstrap_nodeid_ip,
and the redis-base template is updated to use the new hiera
key.

The old bootstrap_nodeid_ip appears to only be used for redis,
so the old key is removed, with an upgrade release note added
should any out-of-tree services reference this value.

Partial-Bug: #1792613
Change-Id: I830d5b9bae3e9d65c2c393e3dcdf70bffdb1ac7b
2018-11-26 17:01:24 +00:00
James Slagle
7f42272024 Add AllNodesExtraMapData parameter
The AllNodesExtraMapData parameter is used to inject additional
hieradata into the all_nodes hierdata file on each node. The injected
data will be deeploy merged with the calculated all_nodes data for the
stack.

The parameter can be taken advantage of for split-controlplane use cases
where the hieradata from the control stack needs to be populated into
the separate compute stacks.

To easily get the hieradata out of the control stack, a new stack output
is added, AllNodesConfig.

Partially Implements: blueprint split-controlplane

Change-Id: I7b865bf82520006eef3ac2f36df34b1f3c34e642
2018-07-09 12:22:32 -04:00
Tim Rozet
3b81a45281 Revert "Only add internal_api_virtual_ip if InternalApi is in network_data"
This reverts commit 8cfaf354d2673c9d4b8bc955ab8adc81de167b1d.

Change-Id: Ib8ff69a4bc869de21ad838b3bc6c38a8676036c6
2018-06-04 20:26:31 +00:00
Harald Jensås
8cfaf354d2 Only add internal_api_virtual_ip if InternalApi is in network_data
Add's a conditional to only include internal_api_virtual_ipi
if InternalApi network is defined in custom networks.

Closes-Bug: 1772124
Change-Id: I332355dc63c414aa411b3c1e09dc950b54d5d175
2018-05-21 13:17:23 +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
waleed mousa
77ae5a61a0 Replacing the count with loop.index for indexing
Replacing the count with loop.index in all-nodes-config.j2.yaml
after the Jinja changes

Change-Id: Id703f6c85f27cdde0b2d48b18e938e55d31a491a
Closes-Bug: #1754679
2018-03-11 09:46:12 -04:00
Oliver Walsh
37a339d2b0 Add support for libvirt VNC TLS
Configures certs/key for nova-novnc vencrypt when TLS is enabled on the
internal network. A dedicated IPA sub-CA can be used to restrict access,
however by default the main IPA CA is used.

Depends-On: Ic73bcbdbecc1bc05f43acdd5480370f37ead3fb8
Change-Id: I67ffd847dc2d1949833a9d7039ad51e4364e02da
2018-02-22 15:46:39 +00:00
Lee Yarwood
3d8f47a71a ffu: Allow FASTFORWARDUPGRADE as a StackUpdateType
This change allows FASTFORWARDUPGRADE to be fed to puppet-tripleo
allowing mainifests to act according when applied during FFU.

Change-Id: I8792937c2524c31becfb8a9f28047b73617c0fc3
2018-02-13 10:53:55 -05:00
Jan Provaznik
96b82d149e Add support for ceph-nfs manila backend
If ceph-nfs (ganesha) service is enabled, it's set up by ceph-ansible
and it can be used as a manila backend. Manila can be configured to use
ceph either directly (manila-cephfsnative-config-docker.yaml env file)
or through ganesha (environments/manila-cephfganesha-config-docker.yaml
env file).

Change-Id: Ib408c7827e5fba0c1b01388db26363806fc64370
Partially-Implements: blueprint nfs-ganesha
2018-02-06 19:04:39 +00:00
Bob Fournier
f75f429ef4 Set cloud_name hiera parameter for composable networks
This sets the cloud_name hiera parameter using jinja for all
networks including any custom networks.

It also cleans up hiera parameters for virtual ips that are no
longer being used due to https://review.openstack.org/#/c/531037/.
The internal_api_virtual_ip parameter must be kept because its
used for contrail.

Change-Id: I876263d374804e9f032f511112baa5fa7e67b49b
Closes-Bug: 1740953
2018-01-11 17:04:38 -05:00
Bob Fournier
749a99a5cd Add composable network VIPs for puppet configuration
Adds new hiera parameters for VIPs for all isolated networks including
any custom composable networks.  The existing hard-coded network parameters
can be removed when the puppet-tripleo change
https://review.openstack.org/#/c/531037 merges that no longer uses them.

The new network_virtual_ips paramater contains the network name, vip, and
an index used to generate the vrouter_id in puppet-tripleo.

Change-Id: If8d3219a0714e3db34980e884dce84912a837865
Partial-Bug: 1741129
2018-01-04 16:48:28 -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
Juan Antonio Osorio Robles
365230af46 Dynamically generate VIP hiera entries
These were hardcoded, even though the rest of the network-related bits
were dynamically generated with jinja.

This will end up creating the same entries as before, skipping the VIP
for the Tenant network and the Management network (which is not included
in the default roles). Also, the external network will now have an extra
hiera entry called external_virtual_ip, besides the public_virtual_ip.
They will have the same value, however, external_virtual_ip is
automatically generated as opposed to the public_virtual_ip. Hopefully
we can remove the instance of public_virtual_ip at some point and rely
on the automatically generated entries only.

Change-Id: I7f5285e2936b2158a4a8a5edc97a6a09f891fb1a
Related-Bug: #1732457
2017-11-17 15:00:30 +00:00
Oliver Walsh
61fcfca045 Refactor cellv2 host discovery logic to avoid races
The compute service list is polled until all expected hosts are reported or a
timeout occurs (600s).

Adds a cellv2_discovery flag to puppet services. Used to generate a list of
hosts that should have cellv2 host mappings.

Adds a canonical fqdn and that should match the fqdn reported by a host.

Adds the ability to upload a config script for docker config instead of using
complex bash on-liners.

Closes-bug: 1720821
Change-Id: I33e2f296526c957cb5f96dff19682a4e60c6a0f0
2017-11-08 23:20:46 +00:00
Steven Hardy
ef1768e40c Fix some missed hard-coded network references
These got missed in the refactoring to support composable networks.

Change-Id: I5c97df08ae84e9c383175687428fb00143d171ff
Closes-Bug: #1720849
2017-10-03 16:49:32 +01:00