openstack
/
tripleo-common
Code Issues Proposed changes

Merge "Add ironic-neutron-agent container" into stable/queens

This commit is contained in:
Zuul 2019-08-16 18:47:03 +00:00 committed by Gerrit Code Review
parent 4e33355a2c 30e574e31d
commit e936a88637
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
container-images/overcloud_containers.yaml
View File

@ -34,6 +34,7 @@ container_images:
- imagename: docker.io/tripleoqueens/centos-binary-ironic-conductor:current-tripleo - imagename: docker.io/tripleoqueens/centos-binary-ironic-conductor:current-tripleo
- imagename: docker.io/tripleoqueens/centos-binary-ironic-inspector:current-tripleo - imagename: docker.io/tripleoqueens/centos-binary-ironic-inspector:current-tripleo
- imagename: docker.io/tripleoqueens/centos-binary-ironic-pxe:current-tripleo - imagename: docker.io/tripleoqueens/centos-binary-ironic-pxe:current-tripleo
- imagename: docker.io/tripleoqueens/centos-binary-ironic-neutron-agent:current-tripleo
- imagename: docker.io/tripleoqueens/centos-binary-iscsid:current-tripleo - imagename: docker.io/tripleoqueens/centos-binary-iscsid:current-tripleo
- imagename: docker.io/tripleoqueens/centos-binary-keepalived:current-tripleo - imagename: docker.io/tripleoqueens/centos-binary-keepalived:current-tripleo
- imagename: docker.io/tripleoqueens/centos-binary-keystone:current-tripleo - imagename: docker.io/tripleoqueens/centos-binary-keystone:current-tripleo

7
container-images/overcloud_containers.yaml.j2
View File

@ -270,6 +270,13 @@ container_images_template:
- OS::TripleO::Services::IronicConductor - OS::TripleO::Services::IronicConductor
- OS::TripleO::Services::IronicPxe - OS::TripleO::Services::IronicPxe
- imagename: "{{namespace}}/{{name_prefix}}ironic-neutron-agent{{name_suffix}}:{{tag}}"
params:
- DockerIronicNeutronAgentImage
- DockerNeutronConfigImage
services:
- OS::TripleO::Services::IronicNeutronAgent
- imagename: "{{namespace}}/{{name_prefix}}iscsid{{name_suffix}}:{{tag}}" - imagename: "{{namespace}}/{{name_prefix}}iscsid{{name_suffix}}:{{tag}}"
params: params:
- DockerIscsidConfigImage - DockerIscsidConfigImage