ceph grains keyring fixes
Change-Id: I90897170132be46dad2f223d06cc135d329ab8cf
diff --git a/ceph/mon/cluster_init.yml b/ceph/mon/cluster_init.yml
new file mode 100644
index 0000000..c56b574
--- /dev/null
+++ b/ceph/mon/cluster_init.yml
@@ -0,0 +1,17 @@
+parameters:
+ ceph:
+ common:
+ keyring:
+ admin:
+ caps:
+ mds: "allow *"
+ mgr: "allow *"
+ mon: "allow *"
+ osd: "allow *"
+ mon:
+ enabled: true
+ keyring:
+ mon:
+ caps:
+ mon: "allow *"
+
diff --git a/cinder/control/backend/ceph.yml b/cinder/control/backend/ceph.yml
index 3b036d4..47846ae 100644
--- a/cinder/control/backend/ceph.yml
+++ b/cinder/control/backend/ceph.yml
@@ -1,4 +1,6 @@
parameters:
+ _param:
+ cinder_storage_client_key: ''
cinder:
controller:
default_volume_type: standard-iops
diff --git a/cinder/volume/backend/ceph.yml b/cinder/volume/backend/ceph.yml
index 945f2f9..6b41224 100644
--- a/cinder/volume/backend/ceph.yml
+++ b/cinder/volume/backend/ceph.yml
@@ -1,4 +1,6 @@
parameters:
+ _param:
+ cinder_storage_client_key: ''
cinder:
volume:
message_queue:
diff --git a/nova/compute/storage/ceph.yml b/nova/compute/storage/ceph.yml
index 7cb24cb..7e14e1b 100644
--- a/nova/compute/storage/ceph.yml
+++ b/nova/compute/storage/ceph.yml
@@ -1,4 +1,6 @@
parameters:
+ _param:
+ nova_storage_client_key: nova
nova:
compute:
ceph:
@@ -7,4 +9,4 @@
rbd_pool: ${_param:nova_storage_pool}
secret_uuid: ${_param:nova_storage_secret_uuid}
client_cinder_key: ${_param:nova_storage_client_key}
- rbd_user: ${_param:nova_storage_user}
\ No newline at end of file
+ rbd_user: ${_param:nova_storage_user}
diff --git a/reclass/storage/system/ceph_mon_cluster.yml b/reclass/storage/system/ceph_mon_cluster.yml
index 85beafb..f795602 100644
--- a/reclass/storage/system/ceph_mon_cluster.yml
+++ b/reclass/storage/system/ceph_mon_cluster.yml
@@ -12,6 +12,7 @@
domain: ${_param:cluster_domain}
classes:
- cluster.${_param:cluster_name}.ceph.mon
+ - system.ceph.mon.cluster_init
params:
salt_master_host: ${_param:reclass_config_master}
linux_system_codename: ${_param:ceph_mon_system_codename}
diff --git a/salt/control/cluster/ceph_mon_cluster.yml b/salt/control/cluster/ceph_mon_cluster.yml
new file mode 100644
index 0000000..bccec01
--- /dev/null
+++ b/salt/control/cluster/ceph_mon_cluster.yml
@@ -0,0 +1,29 @@
+parameters:
+ salt:
+ control:
+ size:
+ ceph.mon:
+ cpu: 16
+ ram: 32768
+ disk_profile: small
+ net_profile: default
+ cluster:
+ internal:
+ domain: ${_param:cluster_domain}
+ engine: virt
+ node:
+ cmn01:
+ name: ${_param:ceph_mon_node01_hostname}
+ provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
+ image: ${_param:salt_control_xenial_image}
+ size: ceph.mon
+ cmn02:
+ name: ${_param:ceph_mon_node02_hostname}
+ provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
+ image: ${_param:salt_control_xenial_image}
+ size: ceph.mon
+ cmn03:
+ name: ${_param:ceph_mon_node03_hostname}
+ provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
+ image: ${_param:salt_control_xenial_image}
+ size: ceph.mon
\ No newline at end of file