diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-08-18 09:29:35 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-08-18 09:29:35 +0000 |
| commit | f737847c33c4a518fcb9c5909ed077a2e3811b43 (patch) | |
| tree | 62350a185c38afb35f16a2930380590599fdece4 /puppet/ceph-storage.yaml | |
| parent | aca397bcc74bd3e8e7926d4c9e18730e8dfd745a (diff) | |
| parent | 0df577c6f0acc672b53d470e4cfedb1d7d9c53d1 (diff) | |
Merge "Add tripleo-packages composable service"
Diffstat (limited to 'puppet/ceph-storage.yaml')
| -rw-r--r-- | puppet/ceph-storage.yaml | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/puppet/ceph-storage.yaml b/puppet/ceph-storage.yaml index 659f2a67..de5a9c39 100644 --- a/puppet/ceph-storage.yaml +++ b/puppet/ceph-storage.yaml @@ -22,10 +22,6 @@ parameters: default: default constraints: - custom_constraint: nova.keypair - EnablePackageInstall: - default: 'false' - description: Set to true to enable package installation via Puppet - type: boolean ServiceNetMap: default: {} description: Mapping of service_name -> network name. Typically set @@ -234,7 +230,6 @@ resources: config: {get_resource: CephStorageConfig} server: {get_resource: CephStorage} input_values: - enable_package_install: {get_param: EnablePackageInstall} enable_package_upgrade: {get_attr: [UpdateDeployment, update_managed_packages]} ceph_cluster_network: get_attr: @@ -286,7 +281,6 @@ resources: mapped_data: {get_param: ExtraConfig} ceph: mapped_data: - tripleo::packages::enable_install: {get_input: enable_package_install} tripleo::packages::enable_upgrade: {get_input: enable_package_upgrade} ceph::profile::params::cluster_network: {get_input: ceph_cluster_network} ceph::profile::params::public_network: {get_input: ceph_public_network} |