diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-10-10 19:35:57 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-10-10 19:35:57 +0000 |
| commit | ca91ce746fab61c6c13d16e8928fc09003e2bc4c (patch) | |
| tree | fdc8c9a0f4492fb605b0e3cfd0e56690252ca9d4 /environments | |
| parent | f9c48f6d62a8af4aba698f1cc7361329609a2c6f (diff) | |
| parent | 87e83b796d2f2900b536a6b0a2b67d9cc810845f (diff) | |
Merge "Remove unneeded *_enable_backend hiera from Manila backends"
Diffstat (limited to 'environments')
| -rw-r--r-- | environments/manila-cephfsnative-config.yaml | 1 | ||||
| -rw-r--r-- | environments/manila-generic-config.yaml | 1 | ||||
| -rw-r--r-- | environments/manila-netapp-config.yaml | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/environments/manila-cephfsnative-config.yaml b/environments/manila-cephfsnative-config.yaml index c2f65800..825a5066 100644 --- a/environments/manila-cephfsnative-config.yaml +++ b/environments/manila-cephfsnative-config.yaml @@ -9,7 +9,6 @@ resource_registry: parameter_defaults: - ManilaCephFSNativeEnableBackend: true ManilaCephFSNativeBackendName: cephfsnative ManilaCephFSNativeDriverHandlesShareServers: false ManilaCephFSNativeCephFSConfPath: '/etc/ceph/ceph.conf' diff --git a/environments/manila-generic-config.yaml b/environments/manila-generic-config.yaml index a847a02b..9344bc6e 100644 --- a/environments/manila-generic-config.yaml +++ b/environments/manila-generic-config.yaml @@ -11,7 +11,6 @@ parameter_defaults: ManilaServiceInstancePassword: '' ManilaServiceInstanceFlavorId: 2 ManilaServiceNetworkCidr: '172.16.0.0/16' - ManilaGenericEnableBackend: true ManilaGenericBackendName: tripleo_generic ManilaGenericDriverHandlesShareServers: true ManilaGenericSmbTemplateConfigPath: '$state_path/smb.conf' diff --git a/environments/manila-netapp-config.yaml b/environments/manila-netapp-config.yaml index 98de6adf..3dadfe5d 100644 --- a/environments/manila-netapp-config.yaml +++ b/environments/manila-netapp-config.yaml @@ -7,7 +7,6 @@ resource_registry: OS::Tripleo::Services::ManilaBackendNetapp: ../puppet/services/manila-backend-netapp.yaml parameter_defaults: - ManilaNetappEnableBackend: true ManilaNetappBackendName: tripleo_netapp ManilaNetappDriverHandlesShareServers: true ManilaNetappLogin: '' |