HPC/openstack_dockers
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: HPC:73e26ea716f1e72f4dddedcb132820e78ea78d58
Branches Tags
HPC:master
HPC:merlin
HPC:feature/federated-login
HPC:feature/federated-login-before-rebase
HPC:feature/bagpipe
...
compare: HPC:71d2bc13eaf12337efea2cfc0d7f1eeb7f34b2a2
Branches Tags
HPC:master
HPC:merlin
HPC:feature/federated-login
HPC:feature/federated-login-before-rebase
HPC:feature/bagpipe

2 Commits
73e26ea716 ... 71d2bc13ea

Author SHA1 Message Date
Egon Rijpkema
71d2bc13ea make rbd secrets a variable secret to be set here. 2018-09-13 16:13:49 +02:00
Egon Rijpkema
5ae8a4cf1a Fixed typo 2018-09-13 11:52:18 +02:00
3 changed files with 8 additions and 8 deletions
Show Stats Expand all files Collapse all files

12
cinder_storage/write_conf.sh
View File

@ -30,11 +30,11 @@ password = $CINDER_PASSWORD
lock_path = /var/lib/cinder/tmp lock_path = /var/lib/cinder/tmp
[RBD-backend] [RBD-backend]
volume_backend_name=RBD-backend volume_backend_name = RBD-backend
rbd_pool=volumes rbd_pool = volumes
rbd_user=volumes rbd_user = volumes
rbd_secret_uuid=d0db6ba7-a0c9-4da6-b0bc-aa7846325333 rbd_secret_uuid = $RBD_SECRET_UUID
volume_driver=cinder.volume.drivers.rbd.RBDDriver volume_driver = cinder.volume.drivers.rbd.RBDDriver
rbd_ceph_conf=/etc/ceph/ceph.conf rbd_ceph_conf = /etc/ceph/ceph.conf
EOF EOF

2
keystone/run.sh
View File

@ -15,7 +15,7 @@ chown _shibd: /etc/shibboleth/sp*.pem
shibd -f -F & shibd -f -F &
# If any process fails, kill the rest. # If any process fails, kill the rest.
# This insures the container stops and systemd will restart it. # This ensures the container stops and systemd will restart it.
wait -n wait -n
pkill -P $$ pkill -P $$

2
nova_compute/write_conf.sh
View File

@ -127,7 +127,7 @@ images_type = rbd
images_rbd_pool = volumes images_rbd_pool = volumes
images_rbd_ceph_conf = /etc/ceph/ceph.conf images_rbd_ceph_conf = /etc/ceph/ceph.conf
rbd_user = volumes rbd_user = volumes
rbd_secret_uuid = d0db6ba7-a0c9-4da6-b0bc-aa7846325333 rbd_secret_uuid = $RBD_SECRET_UUID
[vnc] [vnc]