some ceph changes

This commit is contained in:
Wim Nap 2018-07-06 09:56:05 +02:00
parent 239daeceee
commit a6b1f53f90
4 changed files with 5 additions and 3 deletions

2
merlin
View File

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

View File

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

View File

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

View File

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