Add ironic-api relation

This commit is contained in:
Gabriel Adrian Samfira 2020-09-15 15:05:57 +00:00
parent e97054286b
commit 7a9d41dff3
6 changed files with 9 additions and 11 deletions

View File

@ -43,7 +43,7 @@ options:
type: string
description: OpenStack Region
use-ipxe:
default: false
default: true
type: boolean
description: |
Use iPXE instead of PXE. This option will install an aditional

View File

@ -3,6 +3,7 @@ includes:
- interface:mysql-shared
- interface:rabbitmq
- interface:keystone-credentials
- interface:ironic-api
repo: https://github.com/gabriel-samfira/charm-ironic-conductor
options:
basic:

View File

@ -58,11 +58,8 @@ class PXEBootBase(object):
}
def determine_packages(self):
default_packages = self.PACKAGES + self.TFTP_PACKAGES
use_ipxe = self._config.get('use-ipxe', False)
hookenv.log(">>>>>>>>> USE IPXE: %r --> %r" % (use_ipxe, self._config))
if use_ipxe:
default_packages.extend(self.HTTPD_PACKAGES)
default_packages = (
self.PACKAGES + self.TFTP_PACKAGES + self.HTTPD_PACKAGES)
return default_packages
def _copy_resources(self):

View File

@ -94,7 +94,7 @@ class IronicConductorCharm(charms_openstack.charm.OpenStackCharm):
services = ['ironic-conductor', 'tftpd-hpa']
required_relations = [
'shared-db', 'amqp', 'identity-credentials']
'shared-db', 'amqp', 'identity-credentials', 'ironic-api']
restart_map = {
IRONIC_CONF: ['ironic-conductor', ],
@ -129,9 +129,6 @@ class IronicConductorCharm(charms_openstack.charm.OpenStackCharm):
self.restart_map.update(self.pxe_config.get_restart_map())
def _configure_ipxe_webserver(self):
if self.config.get('use-ipxe', False) is False:
self.purge_packages.extend(self.pxe_config.HTTPD_PACKAGES)
return
httpd_svc_name = self.pxe_config.HTTPD_SERVICE_NAME
self.services.append(httpd_svc_name)
self.restart_map[self.pxe_config.HTTP_SERVER_CONF] = [httpd_svc_name,]

View File

@ -27,4 +27,6 @@ requires:
amqp:
interface: rabbitmq
identity-credentials:
interface: keystone-credentials
interface: keystone-credentials
ironic-api:
interface: baremetal

View File

@ -20,6 +20,7 @@ charm.use_defaults(
@reactive.when('shared-db.available')
@reactive.when('ironic-api.available')
@reactive.when('identity-credentials.available')
@reactive.when('amqp.available')
def render_stuff(*args):