diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-09-17 02:53:34 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-09-17 02:53:35 +0000 |
| commit | 430db61b817d8e276e3986777fe96a66546c5222 (patch) | |
| tree | 8089e65453296523f2cb7f2d955595cae95095c4 /environments/manila-generic-config.yaml | |
| parent | 22da7a0fcecf5cc0e833a660f3bd06f40e1ff6fd (diff) | |
| parent | 98b47767478eda2c940098217e93ec3567fa9f36 (diff) | |
Merge "Add NetApp Manila driver integration and tidy up generic"
Diffstat (limited to 'environments/manila-generic-config.yaml')
| -rw-r--r-- | environments/manila-generic-config.yaml | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/environments/manila-generic-config.yaml b/environments/manila-generic-config.yaml index 74011c66..a847a02b 100644 --- a/environments/manila-generic-config.yaml +++ b/environments/manila-generic-config.yaml @@ -1,13 +1,16 @@ -# A Heat environment file which can be used to enable a -# a Manila generic driver backend. +# This environment file enables Manila with the Generic backend. resource_registry: OS::Tripleo::Services::ManilaApi: ../puppet/services/manila-api.yaml OS::Tripleo::Services::ManilaScheduler: ../puppet/services/manila-scheduler.yaml # Only manila-share is pacemaker managed: OS::Tripleo::Services::ManilaShare: ../puppet/services/pacemaker/manila-share.yaml - + OS::Tripleo::Services::ManilaBackendGeneric: ../puppet/services/manila-backend-generic.yaml parameter_defaults: + ManilaServiceInstanceUser: '' + ManilaServiceInstancePassword: '' + ManilaServiceInstanceFlavorId: 2 + ManilaServiceNetworkCidr: '172.16.0.0/16' ManilaGenericEnableBackend: true ManilaGenericBackendName: tripleo_generic ManilaGenericDriverHandlesShareServers: true @@ -20,7 +23,3 @@ parameter_defaults: ManilaGenericServiceInstanceSmbConfigPath: '$share_mount_path/smb.conf' ManilaGenericShareVolumeFsType: 'ext4' ManilaGenericCinderVolumeType: '' - ManilaGenericServiceInstanceUser: '' - ManilaGenericServiceInstancePassword: '' - ManilaGenericServiceInstanceFlavorId: 2 - ManilaGenericServiceNetworkCidr: '172.16.0.0/16' |