Revision 3cfbb666

View differences:

src/datastore_mad/remotes/ceph/monitor
70 70
fi
71 71

  
72 72
if [ -n "$CEPH_KEY" ]; then
73
    RBD="$RBD --keyfile ${CEPH_KEY}"
73
    CEPH="$CEPH --keyfile ${CEPH_KEY}"
74 74
fi
75 75

  
76 76
if [ -n "$CEPH_CONF" ]; then
src/tm_mad/ceph/delete
113 113
                    /VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/SOURCE \
114 114
                    /VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/CLONE \
115 115
                    /VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/CEPH_USER \
116
                    /VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/CEPH_KEY \
116 117
                    /VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/CEPH_CONF \
117 118
                    /VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/POOL_NAME)
118 119

  
119 120
SRC="${XPATH_ELEMENTS[j++]}"
120 121
CLONE="${XPATH_ELEMENTS[j++]}"
121 122
CEPH_USER="${XPATH_ELEMENTS[j++]}"
123
CEPH_KEY="${XPATH_ELEMENTS[j++]}"
122 124
CEPH_CONF="${XPATH_ELEMENTS[j++]}"
123 125
POOL_NAME="${XPATH_ELEMENTS[j++]:-$POOL_NAME}"
124 126

  
......
131 133
    RBD="$RBD --id ${CEPH_USER}"
132 134
fi
133 135

  
136
if [ -n "$CEPH_KEY" ]; then
137
    RBD="$RBD --keyfile ${CEPH_KEY}"
138
fi
139

  
134 140
if [ -n "$CEPH_CONF" ]; then
135 141
    RBD="$RBD --conf ${CEPH_CONF}"
136 142
fi
src/tm_mad/ceph/monitor
70 70
fi
71 71

  
72 72
if [ -n "$CEPH_KEY" ]; then
73
    RBD="$RBD --keyfile ${CEPH_KEY}"
73
    CEPH="$CEPH --keyfile ${CEPH_KEY}"
74 74
fi
75 75

  
76 76
if [ -n "$CEPH_CONF" ]; then

Also available in: Unified diff