diff options
Diffstat (limited to 'environments')
| -rw-r--r-- | environments/cinder-dellsc-config.yaml | 1 | ||||
| -rw-r--r-- | environments/docker.yaml | 4 | ||||
| -rw-r--r-- | environments/network-isolation.j2.yaml | 2 |
3 files changed, 6 insertions, 1 deletions
diff --git a/environments/cinder-dellsc-config.yaml b/environments/cinder-dellsc-config.yaml index 99e517bf..681a2fe9 100644 --- a/environments/cinder-dellsc-config.yaml +++ b/environments/cinder-dellsc-config.yaml @@ -19,3 +19,4 @@ parameter_defaults: CinderDellScSecondarySanLogin: 'Admin' CinderDellScSecondarySanPassword: '' CinderDellScSecondaryScApiPort: 3033 + CinderDellScExcludedDomainIp: '' diff --git a/environments/docker.yaml b/environments/docker.yaml index 16e7a3d2..6b152bfc 100644 --- a/environments/docker.yaml +++ b/environments/docker.yaml @@ -48,6 +48,10 @@ resource_registry: OS::TripleO::Services::Horizon: ../docker/services/horizon.yaml OS::TripleO::Services::Iscsid: ../docker/services/iscsid.yaml OS::TripleO::Services::Multipathd: ../docker/services/multipathd.yaml + OS::TripleO::Services::CinderApi: ../docker/services/cinder-api.yaml + 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 OS::TripleO::PostDeploySteps: ../docker/post.yaml OS::TripleO::PostUpgradeSteps: ../docker/post-upgrade.yaml diff --git a/environments/network-isolation.j2.yaml b/environments/network-isolation.j2.yaml index 3ef9b275..6a7318fc 100644 --- a/environments/network-isolation.j2.yaml +++ b/environments/network-isolation.j2.yaml @@ -13,7 +13,7 @@ resource_registry: # networks as defined in network_data.yaml {%- for network in networks if network.enabled|default(true) %} - OS::TripleO::Network::{{network.name}}: ../network/{{network.name.lower()}}.yaml + OS::TripleO::Network::{{network.name}}: ../network/{{network.name_lower|default(network.name.lower())}}.yaml {%- endfor %} # Port assignments for the VIPs |