diff options
author | Giulio Fidente <gfidente@redhat.com> | 2016-08-17 20:18:38 +0200 |
---|---|---|
committer | Giulio Fidente <gfidente@redhat.com> | 2016-08-24 12:51:15 +0200 |
commit | d90363bd58314c0ae3c166a70d4d1c89391f9386 (patch) | |
tree | d526085cd26febfcd8487a37f9a44991897e8807 /puppet/ceph-storage.yaml | |
parent | 95949a297574ee7e823fbeb4d8e7420432dcabe1 (diff) |
Move out of roles any Ceph setting
Change-Id: I6ff0f977a1fb2fd55b29becd296ab01c65b50228
Diffstat (limited to 'puppet/ceph-storage.yaml')
-rw-r--r-- | puppet/ceph-storage.yaml | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/puppet/ceph-storage.yaml b/puppet/ceph-storage.yaml index de5a9c39..829456b5 100644 --- a/puppet/ceph-storage.yaml +++ b/puppet/ceph-storage.yaml @@ -231,22 +231,6 @@ resources: server: {get_resource: CephStorage} input_values: enable_package_upgrade: {get_attr: [UpdateDeployment, update_managed_packages]} - ceph_cluster_network: - get_attr: - - NetIpMap - - net_ip_map - - str_replace: - template: "NETWORK_subnet" - params: - NETWORK: {get_param: [ServiceNetMap, CephClusterNetwork]} - ceph_public_network: - get_attr: - - NetIpMap - - net_ip_map - - str_replace: - template: "NETWORK_subnet" - params: - NETWORK: {get_param: [ServiceNetMap, CephPublicNetwork]} CephStorageConfig: type: OS::Heat::StructuredConfig @@ -261,8 +245,6 @@ resources: - extraconfig - service_names - service_configs - - ceph_cluster # provided by CephClusterConfig - - ceph - all_nodes # provided by allNodesConfig - '"%{::osfamily}"' merge_behavior: deeper @@ -282,8 +264,6 @@ resources: ceph: mapped_data: 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} # Resource for site-specific injection of root certificate NodeTLSCAData: |