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

Compare commits

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

No commits in common. "71d2bc13eaf12337efea2cfc0d7f1eeb7f34b2a2" and "73e26ea716f1e72f4dddedcb132820e78ea78d58" have entirely different histories.
71d2bc13ea ... 73e26ea716

3 changed files with 8 additions and 8 deletions
Show Stats Expand all files Collapse all files

2
cinder_storage/write_conf.sh
View File

@ -33,7 +33,7 @@ lock_path = /var/lib/cinder/tmp
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 = $RBD_SECRET_UUID rbd_secret_uuid=d0db6ba7-a0c9-4da6-b0bc-aa7846325333
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

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 ensures the container stops and systemd will restart it. # This insures 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 = $RBD_SECRET_UUID rbd_secret_uuid = d0db6ba7-a0c9-4da6-b0bc-aa7846325333
[vnc] [vnc]