Add docker ironic services

This patch adds docker services for Ironic API and Ironic
Conductor.

Change-Id: Icea5ae2ecd7e749ce95ed8444c3a5ef3e035bb4e
This commit is contained in:
Dan Prince 2017-01-17 15:45:18 -05:00
parent 84626c82cc
commit 2902640adc
3 changed files with 341 additions and 0 deletions

View File

@ -0,0 +1,99 @@
heat_template_version: ocata
description: >
OpenStack containerized Ironic API service
parameters:
DockerNamespace:
description: namespace
default: 'tripleoupstream'
type: string
DockerIronicApiImage:
description: image
default: 'centos-binary-ironic-api:latest'
type: string
DockerIronicConfigImage:
description: image
default: 'centos-binary-ironic-pxe:latest'
type: string
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
via parameter_defaults in the resource registry.
type: json
ServiceNetMap:
default: {}
description: Mapping of service_name -> network name. Typically set
via parameter_defaults in the resource registry. This
mapping overrides those in ServiceNetMapDefaults.
type: json
DefaultPasswords:
default: {}
type: json
resources:
IronicApiBase:
type: ../../puppet/services/ironic-api.yaml
properties:
EndpointMap: {get_param: EndpointMap}
ServiceNetMap: {get_param: ServiceNetMap}
DefaultPasswords: {get_param: DefaultPasswords}
outputs:
role_data:
description: Role data for the Ironic API role.
value:
service_name: {get_attr: [IronicApiBase, role_data, service_name]}
config_settings:
map_merge:
- get_attr: [IronicApiBase, role_data, config_settings]
step_config: {get_attr: [IronicApiBase, role_data, step_config]}
service_config_settings: {get_attr: [IronicApiBase, role_data, service_config_settings]}
# BEGIN DOCKER SETTINGS
docker_image: &ironic_image
list_join:
- '/'
- [ {get_param: DockerNamespace}, {get_param: DockerIronicApiImage} ]
puppet_tags: ironic_config
config_volume: ironic
config_image:
list_join:
- '/'
- [ {get_param: DockerNamespace}, {get_param: DockerIronicConfigImage} ]
kolla_config:
/var/lib/kolla/config_files/ironic_api.json:
command: /usr/bin/ironic-api
config_files:
- dest: /etc/ironic/ironic.conf
owner: ironic
perm: '0640'
source: /var/lib/kolla/config_files/src/etc/ironic/ironic.conf
docker_config:
step_3:
ironic_db_sync:
image: *ironic_image
net: host
privileged: false
detach: false
volumes:
- /var/lib/config-data/ironic/etc/:/etc/:ro
- /etc/hosts:/etc/hosts:ro
- /etc/localtime:/etc/localtime:ro
environment:
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
command: ['ironic-dbsync', '--config-file', '/etc/ironic/ironic.conf']
step_4:
ironic_api:
start_order: 10
image: *ironic_image
net: host
privileged: false
restart: always
volumes:
- /var/lib/kolla/config_files/ironic_api.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/config-data/ironic/:/var/lib/kolla/config_files/src:ro
- /etc/hosts:/etc/hosts:ro
- /etc/localtime:/etc/localtime:ro
environment:
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS

View File

@ -0,0 +1,111 @@
heat_template_version: ocata
description: >
OpenStack containerized Ironic Conductor service
parameters:
DockerNamespace:
description: namespace
default: 'tripleoupstream'
type: string
DockerIronicConductorImage:
description: image
default: 'centos-binary-ironic-conductor:latest'
type: string
DockerIronicConfigImage:
description: image
default: 'centos-binary-ironic-pxe:latest'
type: string
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
via parameter_defaults in the resource registry.
type: json
ServiceNetMap:
default: {}
description: Mapping of service_name -> network name. Typically set
via parameter_defaults in the resource registry. This
mapping overrides those in ServiceNetMapDefaults.
type: json
DefaultPasswords:
default: {}
type: json
resources:
IronicConductorBase:
type: ../../puppet/services/ironic-conductor.yaml
properties:
EndpointMap: {get_param: EndpointMap}
ServiceNetMap: {get_param: ServiceNetMap}
DefaultPasswords: {get_param: DefaultPasswords}
outputs:
role_data:
description: Role data for the Ironic Conductor role.
value:
service_name: {get_attr: [IronicConductorBase, role_data, service_name]}
config_settings:
map_merge:
- get_attr: [IronicConductorBase, role_data, config_settings]
# to avoid hard linking errors we store these on the same
# volume/device as the ironic master_path
- ironic::drivers::pxe::tftp_root: /var/lib/ironic/tftpboot
- ironic::drivers::pxe::tftp_master_path: /var/lib/ironic/tftpboot/master_images
- ironic::pxe::tftp_root: /var/lib/ironic/tftpboot
- ironic::pxe::http_root: /var/lib/ironic/httpboot
- ironic::conductor::http_root: /var/lib/ironic/httpboot
step_config: {get_attr: [IronicConductorBase, role_data, step_config]}
service_config_settings: {get_attr: [IronicConductorBase, role_data, service_config_settings]}
# BEGIN DOCKER SETTINGS
docker_image: &ironic_image
list_join:
- '/'
- [ {get_param: DockerNamespace}, {get_param: DockerIronicConductorImage} ]
puppet_tags: ironic_config
config_volume: ironic
config_image:
list_join:
- '/'
- [ {get_param: DockerNamespace}, {get_param: DockerIronicConfigImage} ]
kolla_config:
/var/lib/kolla/config_files/ironic_conductor.json:
command: /usr/bin/ironic-conductor
config_files:
- dest: /etc/ironic/ironic.conf
owner: ironic
perm: '0640'
source: /var/lib/kolla/config_files/src/etc/ironic/ironic.conf
permissions:
- path: /var/lib/ironic/httpboot
owner: ironic:ironic
recurse: true
- path: /var/lib/ironic/tftpboot
owner: ironic:ironic
recurse: true
docker_config:
step_4:
ironic-init-dirs:
image: *ironic_image
user: root
command: ['/bin/bash', '-c', 'mkdir /var/lib/ironic/httpboot && mkdir /var/lib/ironic/tftpboot']
volumes:
- ironic:/var/lib/ironic
ironic_conductor:
start_order: 80
image: *ironic_image
net: host
privileged: true
restart: always
volumes:
- /var/lib/kolla/config_files/ironic_conductor.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/config-data/ironic/:/var/lib/kolla/config_files/src:ro
- /etc/hosts:/etc/hosts:ro
- /etc/localtime:/etc/localtime:ro
- /lib/modules:/lib/modules:ro
- /sys:/sys
- /dev:/dev
- /run:/run #shared?
- ironic:/var/lib/ironic
environment:
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS

View File

@ -0,0 +1,131 @@
heat_template_version: ocata
description: >
OpenStack containerized Ironic PXE service
parameters:
DockerNamespace:
description: namespace
default: 'tripleoupstream'
type: string
DockerIronicPxeImage:
description: image
default: 'centos-binary-ironic-pxe:latest'
type: string
DockerIronicConfigImage:
description: image
default: 'centos-binary-ironic-pxe:latest'
type: string
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
via parameter_defaults in the resource registry.
type: json
ServiceNetMap:
default: {}
description: Mapping of service_name -> network name. Typically set
via parameter_defaults in the resource registry. This
mapping overrides those in ServiceNetMapDefaults.
type: json
DefaultPasswords:
default: {}
type: json
outputs:
role_data:
description: Role data for the Ironic PXE role.
value:
service_name: ironic_pxe
config_settings: {}
step_config: ''
service_config_settings: {}
# BEGIN DOCKER SETTINGS
docker_image: &ironic_pxe_image
list_join:
- '/'
- [ {get_param: DockerNamespace}, {get_param: DockerIronicPxeImage} ]
puppet_tags: ironic_config
config_volume: ironic
config_image:
list_join:
- '/'
- [ {get_param: DockerNamespace}, {get_param: DockerIronicConfigImage} ]
kolla_config:
/var/lib/kolla/config_files/ironic_pxe_http.json:
command: /usr/sbin/httpd -DFOREGROUND
config_files:
- dest: /etc/ironic/ironic.conf
owner: ironic
perm: '0640'
source: /var/lib/kolla/config_files/src/etc/ironic/ironic.conf
- dest: /etc/httpd/conf.d/10-ipxe_vhost.conf
owner: root
perm: '0644'
source: /var/lib/kolla/config_files/src/etc/httpd/conf.d/10-ipxe_vhost.conf
- dest: /etc/httpd/conf/httpd.conf
owner: root
perm: '0644'
source: /var/lib/kolla/config_files/src/etc/httpd/conf/httpd.conf
- dest: /etc/httpd/conf/ports.conf
owner: root
perm: '0644'
source: /var/lib/kolla/config_files/src/etc/httpd/conf/ports.conf
/var/lib/kolla/config_files/ironic_pxe_tftp.json:
command: /usr/sbin/in.tftpd --foreground --user root --address 0.0.0.0:69 --map-file /var/lib/ironic/tftpboot/map-file /var/lib/ironic/tftpboot
config_files:
- dest: /etc/ironic/ironic.conf
owner: ironic
perm: '0640'
source: /var/lib/kolla/config_files/src/etc/ironic/ironic.conf
- dest: /var/lib/ironic/tftpboot/chain.c32
owner: ironic
perm: '0744'
source: /var/lib/kolla/config_files/src/var/lib/ironic/tftpboot/chain.c32
- dest: /var/lib/ironic/tftpboot/pxelinux.0
owner: ironic
perm: '0744'
source: /var/lib/kolla/config_files/src/var/lib/ironic/tftpboot/pxelinux.0
- dest: /var/lib/ironic/tftpboot/ipxe.efi
owner: ironic
perm: '0744'
source: /var/lib/kolla/config_files/src/var/lib/ironic/tftpboot/ipxe.efi
- dest: /var/lib/ironic/tftpboot/undionly.kpxe
owner: ironic
perm: '0744'
source: /var/lib/kolla/config_files/src/var/lib/ironic/tftpboot/undionly.kpxe
- dest: /var/lib/ironic/tftpboot/map-file
owner: root
perm: '0644'
source: /var/lib/kolla/config_files/src/var/lib/ironic/tftpboot/map-file
docker_config:
step_4:
ironic_pxe_tftp:
start_order: 90
image: *ironic_pxe_image
net: host
privileged: false
restart: always
volumes:
- /var/lib/kolla/config_files/ironic_pxe_tftp.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/config-data/ironic/:/var/lib/kolla/config_files/src:ro
- /etc/hosts:/etc/hosts:ro
- /etc/localtime:/etc/localtime:ro
- /dev/log:/dev/log
- ironic:/var/lib/ironic/
environment:
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
ironic_pxe_http:
start_order: 91
image: *ironic_pxe_image
net: host
privileged: false
restart: always
volumes:
- /var/lib/kolla/config_files/ironic_pxe_http.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/config-data/ironic/:/var/lib/kolla/config_files/src:ro
- /var/lib/config-data/ironic/etc/httpd/conf.modules.d:/etc/httpd/conf.modules.d:ro
- /etc/hosts:/etc/hosts:ro
- /etc/localtime:/etc/localtime:ro
- ironic:/var/lib/ironic/
environment:
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS