diff options
author | Jenkins <jenkins@review.openstack.org> | 2017-07-24 04:36:35 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2017-07-24 04:36:35 +0000 |
commit | 84e6bff8a62539b381c5706fab7b8ea90f00f0dd (patch) | |
tree | 59e3b81a631e215f59cfa0499e7fb12715c26ed6 /environments | |
parent | 32c40b97962ce42346b8e335bc342a618c0baded (diff) | |
parent | 8e5bb308cf0832c1ea3d8aa315542cbfa882b310 (diff) |
Merge "Refactor iscsi initiator-name reset into separate service"
Diffstat (limited to 'environments')
-rw-r--r-- | environments/contrail/roles_data_contrail.yaml | 3 | ||||
-rw-r--r-- | environments/docker-services-tls-everywhere.yaml | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/environments/contrail/roles_data_contrail.yaml b/environments/contrail/roles_data_contrail.yaml index d6d6f291..02129dc2 100644 --- a/environments/contrail/roles_data_contrail.yaml +++ b/environments/contrail/roles_data_contrail.yaml @@ -109,6 +109,7 @@ - OS::TripleO::Services::CinderHPELeftHandISCSI - OS::TripleO::Services::Etcd - OS::TripleO::Services::AuditD + - OS::TripleO::Services::Iscsid - name: Compute CountDefault: 1 @@ -138,6 +139,7 @@ - OS::TripleO::Services::SensuClient - OS::TripleO::Services::FluentdClient - OS::TripleO::Services::AuditD + - OS::TripleO::Services::Iscsid - name: BlockStorage ServicesDefault: @@ -205,6 +207,7 @@ - OS::TripleO::Services::TripleoPackages - OS::TripleO::Services::SensuClient - OS::TripleO::Services::FluentdClient + - OS::TripleO::Services::Iscsid - name: ContrailAnalytics ServicesDefault: diff --git a/environments/docker-services-tls-everywhere.yaml b/environments/docker-services-tls-everywhere.yaml index 8d304494..f6c1b210 100644 --- a/environments/docker-services-tls-everywhere.yaml +++ b/environments/docker-services-tls-everywhere.yaml @@ -20,6 +20,7 @@ resource_registry: OS::TripleO::Services::HeatApi: ../docker/services/heat-api.yaml OS::TripleO::Services::HeatApiCfn: ../docker/services/heat-api-cfn.yaml OS::TripleO::Services::HeatEngine: ../docker/services/heat-engine.yaml + OS::TripleO::Services::Iscsid: ../docker/services/iscsid.yaml OS::TripleO::Services::Keystone: ../docker/services/keystone.yaml OS::TripleO::Services::NeutronApi: ../docker/services/neutron-api.yaml OS::TripleO::Services::NeutronCorePlugin: ../docker/services/neutron-plugin-ml2.yaml |