From 794fece5cc25d74ca0d874174e2c837a15750fbf Mon Sep 17 00:00:00 2001
From: Giulio Fidente <gfidente@redhat.com>
Date: Thu, 2 Jun 2016 02:55:08 +0200
Subject: Switch Ceph Monitor/OSD/Client/External to composable roles

Change-Id: I1921115cb6218c7554348636c404245c79937673
Depends-On: I7ac096feb9f5655003becd79d2eea355a047c90b
Depends-On: I871ef420700e6d0ee5c1e444e019d58b3a9a45a6
---
 puppet/extraconfig/ceph/ceph-external-config.yaml | 120 ----------------------
 1 file changed, 120 deletions(-)
 delete mode 100644 puppet/extraconfig/ceph/ceph-external-config.yaml

(limited to 'puppet/extraconfig/ceph')

diff --git a/puppet/extraconfig/ceph/ceph-external-config.yaml b/puppet/extraconfig/ceph/ceph-external-config.yaml
deleted file mode 100644
index 7c05a5b9..00000000
--- a/puppet/extraconfig/ceph/ceph-external-config.yaml
+++ /dev/null
@@ -1,120 +0,0 @@
-heat_template_version: 2015-04-30
-description: 'Configure parameters for an external Ceph cluster via Puppet.'
-
-parameters:
-  ceph_storage_count:
-    default: 0
-    type: number
-    description: Number of Ceph storage nodes. Used to enable/disable managed Ceph installation.
-  ceph_external_mon_ips:
-    default: ''
-    type: string
-    description: List of external Ceph Mon host IPs.
-  ceph_client_key:
-    default: ''
-    type: string
-    description: Ceph key used to create the 'openstack' user keyring.
-  ceph_fsid:
-    default: ''
-    type: string
-  # The following parameters are unused for external Ceph clusters and
-  # are here and exist for compatibility
-  ceph_admin_key:
-    default: ''
-    type: string
-  ceph_mon_key:
-    default: ''
-    type: string
-  ceph_mon_names:
-    type: comma_delimited_list
-  ceph_mon_ips:
-    type: comma_delimited_list
-  NovaRbdPoolName:
-    default: vms
-    type: string
-  CinderRbdPoolName:
-    default: volumes
-    type: string
-  CinderBackupRbdPoolName:
-    default: backups
-    type: string
-  GlanceRbdPoolName:
-    default: images
-    type: string
-  GnocchiRbdPoolName:
-    default: metrics
-    type: string
-  CephClientUserName:
-    default: openstack
-    type: string
-  CephIPv6:
-    default: False
-    type: boolean
-
-resources:
-  CephClusterConfigImpl:
-    type: OS::Heat::StructuredConfig
-    properties:
-      group: os-apply-config
-      config:
-        hiera:
-          datafiles:
-            ceph_cluster:
-              mapped_data:
-                ceph_storage_count: {get_param: ceph_storage_count}
-                enable_external_ceph: true
-                ceph_ipv6: {get_param: CephIPv6}
-                ceph_mon_host: {get_param: ceph_external_mon_ips}
-                ceph_mon_host_v6: {get_param: ceph_external_mon_ips}
-                ceph::profile::params::fsid: {get_param: ceph_fsid}
-                ceph::profile::params::client_keys:
-                  str_replace:
-                    template: "{
-                      client.CLIENT_USER: {
-                        secret: 'CLIENT_KEY',
-                        mode: '0644',
-                        cap_mon: 'allow r',
-                        cap_osd: 'allow class-read object_prefix rbd_children, allow rwx pool=CINDER_POOL, allow rwx pool=CINDERBACKUP_POOL, allow rwx pool=NOVA_POOL, allow rwx pool=GLANCE_POOL, allow rwx pool=GNOCCHI_POOL'
-                      }
-                    }"
-                    params:
-                      CLIENT_USER: {get_param: CephClientUserName}
-                      CLIENT_KEY: {get_param: ceph_client_key}
-                      NOVA_POOL: {get_param: NovaRbdPoolName}
-                      CINDER_POOL: {get_param: CinderRbdPoolName}
-                      CINDERBACKUP_POOL: {get_param: CinderBackupRbdPoolName}
-                      GLANCE_POOL: {get_param: GlanceRbdPoolName}
-                      GNOCCHI_POOL: {get_param: GnocchiRbdPoolName}
-                ceph::profile::params::ms_bind_ipv6: {get_param: CephIPv6}
-                nova::compute::rbd::libvirt_images_rbd_pool: {get_param: NovaRbdPoolName}
-                tripleo::profile::base::cinder::volume::rbd::cinder_rbd_pool_name: {get_param: CinderRbdPoolName}
-                glance::backend::rbd::rbd_store_pool: {get_param: GlanceRbdPoolName}
-                gnocchi::storage::ceph::ceph_pool: {get_param: GnocchiRbdPoolName}
-                gnocchi::storage::ceph::ceph_username: {get_param: CephClientUserName}
-                nova::compute::rbd::libvirt_rbd_user: {get_param: CephClientUserName}
-                glance::backend::rbd::rbd_store_user: {get_param: CephClientUserName}
-                nova::compute::rbd::rbd_keyring:
-                  list_join:
-                  - '.'
-                  - - 'client'
-                    - {get_param: CephClientUserName}
-                gnocchi::storage::ceph::ceph_keyring:
-                  list_join:
-                  - '.'
-                  - - '/etc/ceph/ceph'
-                    - 'client'
-                    - {get_param: CephClientUserName}
-                    - 'keyring'
-                tripleo::profile::base::cinder::volume::rbd::cinder_rbd_user_name: {get_param: CephClientUserName}
-                ceph_pools:
-                  - {get_param: CinderRbdPoolName}
-                  - {get_param: CinderBackupRbdPoolName}
-                  - {get_param: NovaRbdPoolName}
-                  - {get_param: GlanceRbdPoolName}
-                  - {get_param: GnocchiRbdPoolName}
-
-outputs:
-  config_id:
-    description: The ID of the CephClusterConfigImpl resource.
-    value:
-      {get_resource: CephClusterConfigImpl}
-- 
cgit 1.2.3-korg