diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-06-14 01:00:01 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-06-14 01:00:01 +0000 |
| commit | d9afde3696d2a15c355d911e0069729901c286e8 (patch) | |
| tree | 854a11ce6dcb4256ae3c383d4a5db2b545dbd179 /environments | |
| parent | 2dcad460b39f4fef7cc22f30adcb34abde48678f (diff) | |
| parent | 15c93fdbd9325ea62a8e478a2b35f81db994c38e (diff) | |
Merge "Move iscsid to a container"
Diffstat (limited to 'environments')
| -rw-r--r-- | environments/docker.yaml | 1 | ||||
| -rw-r--r-- | environments/hyperconverged-ceph.yaml | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/environments/docker.yaml b/environments/docker.yaml index b9f8cd75..d071f6bf 100644 --- a/environments/docker.yaml +++ b/environments/docker.yaml @@ -46,6 +46,7 @@ resource_registry: OS::TripleO::Services::CeilometerAgentCompute: ../docker/services/ceilometer-agent-compute.yaml OS::TripleO::Services::CeilometerAgentNotification: ../docker/services/ceilometer-agent-notification.yaml OS::TripleO::Services::Horizon: ../docker/services/horizon.yaml + OS::TripleO::Services::Iscsid: ../docker/services/iscsid.yaml OS::TripleO::PostDeploySteps: ../docker/post.yaml OS::TripleO::PostUpgradeSteps: ../docker/post-upgrade.yaml diff --git a/environments/hyperconverged-ceph.yaml b/environments/hyperconverged-ceph.yaml index 0f7e1143..05a3a391 100644 --- a/environments/hyperconverged-ceph.yaml +++ b/environments/hyperconverged-ceph.yaml @@ -36,3 +36,4 @@ parameter_defaults: - OS::TripleO::Services::NeutronVppAgent - OS::TripleO::Services::MySQLClient - OS::TripleO::Services::Docker + - OS::TripleO::Services::Iscsid |