some ceph changes

merlin

@@ -39,7 +39,7 @@ merlin-managementnode001
 merlin-managementnode002
 
 [cinder-controller]
-merlin-managementnode002
+merlin-managementnode003
 
 [cinder-storage]
 merlin-managementnode002

roles/cinder-storage/templates/cinder-storage.service

@@ -12,7 +12,7 @@ ExecStart=/usr/bin/docker run --name %n \
   --privileged \
   {{ env_vars | replace('\n', '') }} \
   -v /srv/cinder-storage/root:/root \
-  -v /srv/cinder-storage/etc/ceph:/etc/ceph \
+  -v /etc/ceph:/etc/ceph \
   -p 8777:8776 \
   -p 3260:3260 \
   {{ docker_image }}

roles/glance-controller/files/ceph.client.images.keyring

@@ -1,9 +1,2 @@
-$ANSIBLE_VAULT;1.1;AES256
-38396565316335323234336366643364636639306234383033383664383131343861326231633437
-3164323532393735663065313036316664623065383466310a393665393238323265316464393338
-35303535306434363538303032323366353138303363386463313364313864663535386138323634
-3138393163353063650a386532356566396636636365343065343934396163663732663965343038
-63343539643964656538396664633235636639356532616530613838613839623830396565656538
-62613236643632346539613036383230653431643733343737626666633532613030366462326430
-63303339373563366633363130363361643731303030323635323832333165363439623831316636
-64613533313664383164
+[client.images]
+	key = AQDCpDNbJ3DqDBAAvUOUcxEoZNvQUfoaU5i8iQ==

roles/glance-controller/tasks/main.yml

@@ -49,7 +49,7 @@
 - name: copy ceph-client-keyring
   copy:
     src: files/ceph.client.images.keyring
-    dest: /srv/glance/etc/ceph/ceph.client.volumes.keyring
+    dest: /srv/glance/etc/ceph/ceph.client.images.keyring
     mode: 0644
 
 - name: set ceph client keyring

roles/nova-compute/files/ceph.client.nova.keyring

@@ -1,8 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-35383561643837376265356534363538386266646466313034383231313261343566626338613433
-3464373930663738316366383835336235636137356431390a626334343661353733616366633963
-33306166646465356531666364656236633766653639393636396234663538373136373266353136
-3433626231323638300a306437383862316463363533373131343561303934326135663532656630
-38616139373964313963326539346338353664613035633436326433343835343030653936363836
-65313537623937663438663734323265323634376238373761626236353665613931616566306536
-343334346138313539333338336663343863

roles/nova-compute/files/ceph.conf

@@ -10,5 +10,5 @@ auth_client_required = cephx
 public network = 172.23.59.0/24
 osd pool default size = 2
 
-[client.nova]
-keyring = /etc/ceph/ceph.client.nova.keyring
+[client.compute]
+keyring = /etc/ceph/ceph.client.compute.keyring

roles/nova-compute/tasks/ceph.conf

@@ -1,2 +0,0 @@
-[client.nova]
-keyring = /etc/ceph/ceph.client.nova.keyring

roles/nova-compute/tasks/main.yml

@@ -33,8 +33,8 @@
 
 - name: copy ceph-client-keyring
   copy:
-    src: files/ceph.client.nova.keyring
-    dest: /srv/nova-compute/etc/ceph/ceph.client.nova.keyring
+    src: files/ceph.client.compute.keyring
+    dest: /srv/nova-compute/etc/ceph/ceph.client.compute.keyring
     mode: 0644
 
 - name: install service file.

roles/nova-compute/templates/nova-compute.service

@@ -45,7 +45,7 @@ ExecStart=/usr/bin/docker run --name %n \
     -v /var/lib/nova/instances:/var/lib/nova/instances \
     -v /lib/modules:/lib/modules \
     -v /etc/machine-id:/etc/machine-id \
-    -v /srv/nova-compute/etc/ceph:/etc/ceph \
+    -v /etc/ceph:/etc/ceph \
     --network host \
     {{ docker_image }} /etc/run.sh
 

settings.yml

@@ -10,3 +10,5 @@
 - subnet_range: 172.23.128.0/24
 
 - rsa_pub: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDStPUPXkcu81onUm/le54JCu174yXJJDsthDr96Mv8irBVBWuy5FxnaASuDpmC4QE4s0UAIg1iq/SWrr8qdBQ4OVuYFiW0S7ZJvcoKr/40Wh+T5MeltGQfmkDp6kBsfaMSo6M4tF1c8i+XgOgxb4fxHYb8mFhseztRLx6McxJJJLB0nu+T12WQ01nl0XtwD+3EsZWfxRH0KA59VHZSe3Anc5z+Fm7WU+1Vzy6/pkiIhVReI1L6VVhZsIdSu3fQK6fHQcujtfuw6RKEpisZQqnxMUviWQ98yeQXHk6Nx840WCh3vvKveEAoC4Y/UEZa1TMe6PczfUaLjaidUkpulJsP egon@egon-pc
+
+- use_ceph: True