Commit Graph

24 Commits

Author SHA1 Message Date
Cédric Jeanneret ced9f888e9 Flatten Ironic services configuration
This change combines the previous puppet and docker files into a single file
that performs the docker service installation and configuration.

With this patch the baremetal version of Ironic services have been removed.

Change-Id: Icb33158a129356d939940433c82dae25a6334baf
Related-Blueprint: services-yaml-flattening
2018-12-14 07:25:13 +01:00
Zuul 75ff38ba62 Merge "Switch debug to use logging classes" 2018-12-14 05:06:23 +00:00
Harald Jensås 2024bb0218 Ironic Inspector - disjoint ip range(s) for HA
Allow tht parameter IronicInspectorSubnets to specify
per-instance ip range(s) using hostname as key for each
list of ip ranges. For HA deployments use disjoint
address pools to avoid potential address conflict.

Implements: blueprint ironic-inspector-overcloud
Depends-On: Ifae513265b8c35d98012f14f951bac33ae90b66c
Change-Id: Ifdebe9fcc817b4572f1eb461a3396af6b55f1e6b
2018-12-12 08:18:23 +00:00
Alex Schultz ec8cc54df4 Switch debug to use logging classes
The puppet openstack modules have switched the debug setting to a
logging class in the modules. They are starting to remove the base debug
option so we need to switch our usages to use the logging classes

Change-Id: I690448db2de341ec428181f19364c93a3273b565
Needed-By: https://review.openstack.org/#/c/619379/
2018-12-10 08:32:28 -07:00
Alex Schultz fb0e8f62fc Convert dynamic lookups to use colon notation
With the upgrade to puppet 5, we can no longer use dots in the hieradata
key lookups. This change updates the THT for firewall_rules,
haproxy_endpoints and haproxy_userlists to use the colon notation.

Change-Id: I6f67153e04aed191acb715fe8cfa976ee2e75878
Related-Bug: #1803024
2018-11-12 21:21:49 -07:00
Zuul 581b88d716 Merge "Do not purge the Ironic Inspector dhcp-hostsdir" 2018-11-09 10:15:47 +00:00
Harald Jensås 48e7aba0bf Do not purge the Ironic Inspector dhcp-hostsdir
Since the ironic-inspector service and the dnsmasq
service for ironic-inspector is running in different
containters, having the ironic-inspector service
start/stop the dnsmasq service is non-trivial.

Using `--pid="host"` and making the containers
priviligeied seems less than ideal.

This changes the ironic-inspector configuration so
that it will no longer purge the dhcp-hosts dir on
intialization. Purging the directory without also
restarting (or HUP) the dnsmasq service can cause
the configuration in the DHCP service to deviate
from what ironic-inspector intend it to be.

Related-Bug: #1780421
Depends-On: Icc532115891c567dde20a28110bf08f54187c49f
Change-Id: Id26b578b57c46f9993459f83b5f90393d7798a82
2018-11-02 23:29:37 +00:00
Tony Breeds 1697a3f867 Add support for configuring ppc64le in ironic
Change-Id: Id9688f938cf601508b5f514b0e00fae658764402
2018-10-24 10:38:43 +11:00
Milan Kováčik a1a2048d47 Enable inspector dnsmasq dhcp filter
Modify both the inspector and dnsmasq containers for the inspector to be
able to modify dnsmasq configuration on the fly to filter the dhcp
traffic.

The upgrade_tasks moved to the puppet service in order to be shared
between both the containerised and regular deployment.  The upgrade_tasks
were amended with steps to clean-up the iptables inspector chain&rules.

With inspector no longer managing iptables rules, create new rules to
allow DHCP traffic on IronicInspectorInterface.

Co-Authored-By: Harald Jensås <hjensas@redhat.com>
Change-Id: Ic7e32acb8559a7a12cd8767dc68c343872a6a4e3
Depends-On: I056cdadc025f35d8b6fd22f510a7c0a8e259a1f0
2018-06-04 16:36:14 +02:00
Zuul e64c10b9c1 Merge "Change template names to rocky" 2018-05-09 16:21:49 +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
Dmitry Tantsur f7e867b6b4 ironic-inspector: store ramdisk logs even on success in debug mode
Change-Id: I4ec0e1f48a508a8681e6115021cf7bb65ac903d4
2018-05-08 18:35:56 +02:00
Dmitry Tantsur 8cbbd08259 Fix deprecations in the ironic modules
* auth_uri was replaced by www_authenticate_uri
* conductor::api_url is redundant, can be fetched from keystone
* glance_api_servers is redundant, can be fetched from keystone

Change-Id: I654f312754e169c54f3e7072160006b8d3112265
2018-04-26 15:49:23 +02:00
Harald Jensas c60489ecd9 Use ironic::inspector::dnsmasq_ip_subnets
ironic::inspector:dnsmasq_ip_range is deprecated.

Change-Id: If6d3fd5bc354f39072c2e47bbefea69cc2c697ed
2018-03-24 12:44:02 +01:00
Emilien Macchi 5513d94075 ironic/undercloud: align configuration with instack-undercloud
Change-Id: Iaa266da1627ff877f86d7ef8f4709b834f931fde
2018-03-23 20:04:31 -07:00
Steven Hardy 3a7baa8fa6 Convert ServiceNetMap evals to hiera interpolation
Since https://review.openstack.org/#/c/514707/ added the net_ip_map
to hieradata, we can look up the per-network bind IPs via hiera
interpolation instead of heat map_replace.

In some cases the ServiceNetMap lookup is used for other things,
but anywhere we make use of the "magic" translation via NetIpMap
is changed the same way.

This will enable more of the configuration data to be exposed per
role vs per node in a future patch (to simplify our ansible
workflow).

Co-authored-by: Bogdan Dobrelya <bdobreli@redhat.com>
Change-Id: Ie3da9fedbfce87e85f74d8780e7ad1ceadda79c8
2018-03-10 08:18:30 +00: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 faa7feef2e Merge "Add advanced features to ironic-inspector templates" 2017-11-12 10:29:32 +00:00
Dan Prince b4de9e5fbc Add docker templates to configure Ironic inspector
Co-Authored-By: Dmitry Tantsur <dtantsur@redhat.com>
Change-Id: Ib3eab702c0ca5219ef6eb52861589d82f54c6db1
2017-10-30 14:35:27 -04:00
Dan Prince 34edcd2be3 Add advanced features to ironic-inspector templates
Change-Id: Ib70f1a815d37961263b48f0791f487e108addf97
Co-Authored-By: Dmitry Tantsur <dtantsur@redhat.com>
2017-10-16 15:19:35 +02:00
Carlos Camacho 4014ed4e00 Correct template names from ocata to pike.
There are still some HOT templates pointing to ocata and
they should be pointing to pike.

This patch needs to be backported to stable/pike.

Change-Id: I42cc7e6d97e1f9d043d3cf82fc164448558d47bd
2017-10-10 12:45:02 +02:00
Ade Lee c9b7091536 Ensure Debug is a boolean
Oslo does not like it when Debug is not a proper python boolean
Closes-Bug: 1719929

Change-Id: Ib6c3969d4dd75d5fb2cc274266c060acff8d5571
2017-09-27 13:22:07 -04:00
Giulio Fidente baf6eee501 Adds network/cidr mapping into a new service property
Makes it possible to resolve network subnets within a service
template; the data is transported into a new property ServiceData
wired into every service which hopefully is generic enough to
be extended in the future and transport more data.

Data can be consumed in service templates to set config values
which need to know what is the subnet where a deamon operates (for
example the Ceph Public vs Cluster network).

Change-Id: I28e21c46f1ef609517175f7e7ee19e28d1c0cba2
2017-07-14 13:44:04 +02:00
Dan Prince 19ef017f31 Add templates to configure Ironic inspector
Implements: blueprint ironic-inspector-composable-service
Co-Authored-By: Dmitry Tantsur <dtantsur@redhat.com>
Change-Id: I825516f9f5c2b0c03a3f497d6954022714aab988
2017-06-09 16:11:08 +02:00