diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-09-11 15:57:52 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-09-11 15:57:52 +0000 |
| commit | d99b7b9e067a036352fdc94217195f3d7055ea7b (patch) | |
| tree | 3615dba2fbb39da57dfc20b91384ac91a3e359a6 /environments/docker.yaml | |
| parent | bb28bfd03c3897781f277bbcf07c241e43efdc75 (diff) | |
| parent | 5d977e5e1bbf5eba378c9aaff02a44f747f642e6 (diff) | |
Merge "Add Neutron SR-IOV agent container" into stable/pike
Diffstat (limited to 'environments/docker.yaml')
| -rw-r--r-- | environments/docker.yaml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/environments/docker.yaml b/environments/docker.yaml index 67e8a496..06e3d3ab 100644 --- a/environments/docker.yaml +++ b/environments/docker.yaml @@ -56,3 +56,7 @@ resource_registry: # OS::TripleO::Services::CinderScheduler: ../docker/services/cinder-scheduler.yaml # OS::TripleO::Services::CinderBackup: ../docker/services/cinder-backup.yaml # OS::TripleO::Services::CinderVolume: ../docker/services/cinder-volume.yaml + # + # If SR-IOV is enabled on the compute nodes, it will need the SR-IOV + # host configuration. + OS::TripleO::Services::NeutronSriovHostConfig: OS::Heat::None |