General tidy of charm ready for release
Switch functional tests to use cephx; Tests should really align to default configuration, which is to have cephx enabled for a deployment. Updated README to be a little simpler, and default to Xenial rather than Trusty. Added proper Ceph icon. Drop layer dependency on ceph-base - it brings in loads of stuff we don't need. Tidy config.yaml to drop duplicate ceph-public-network. Depends-On: Ied8d5306ab77b8e68efd0a8e5df4087a067f0367 Change-Id: I4ab5438db93ae613e9232ca42df1c23614e212e6
This commit is contained in:
James Page
parent
2353ff93ff
commit
074e02ab94
@ -12,20 +12,14 @@ Usage
|
|||||||
|
|
||||||
Boot things up by using:
|
Boot things up by using:
|
||||||
|
|
||||||
juju deploy -n 3 --config ceph.yaml ceph-mon
|
juju deploy -n 3 ceph-mon
|
||||||
juju deploy -n 3 --config ceph.yaml ceph-osd
|
juju deploy -n 3 ceph-osd
|
||||||
|
|
||||||
In my example deployments on EC2 the following ceph.yaml will work:
|
In my example deployments on EC2 the following ceph.yaml will work:
|
||||||
```
|
|
||||||
ceph-mon:
|
|
||||||
source: cloud:trusty-mitaka
|
|
||||||
ceph-osd:
|
|
||||||
osd-devices: /dev/xvdb
|
|
||||||
ephemeral-unmount: "/mnt"
|
|
||||||
source: cloud:trusty-mitaka
|
|
||||||
```
|
|
||||||
You can then deploy this charm by simply doing:
|
You can then deploy this charm by simply doing:
|
||||||
|
|
||||||
juju deploy --config ceph.yaml ceph-fs
|
juju deploy ceph-fs
|
||||||
juju add-relation ceph-fs ceph-mon
|
juju add-relation ceph-fs ceph-mon
|
||||||
|
|
||||||
Once the ceph-mon and osd charms have bootstrapped the cluster, the ceph-mon
|
Once the ceph-mon and osd charms have bootstrapped the cluster, the ceph-mon
|
||||||
|
|||||||
@ -1,13 +1,4 @@
|
|||||||
options:
|
options:
|
||||||
ceph-public-network:
|
|
||||||
type: string
|
|
||||||
default:
|
|
||||||
description: |
|
|
||||||
The IP address and netmask of the public (front-side) network (e.g.,
|
|
||||||
192.168.0.0/24)
|
|
||||||
.
|
|
||||||
If multiple networks are to be used, a space-delimited list of a.b.c.d/x
|
|
||||||
can be provided.
|
|
||||||
loglevel:
|
loglevel:
|
||||||
default: 1
|
default: 1
|
||||||
type: int
|
type: int
|
||||||
|
|||||||
183
src/icon.svg
183
src/icon.svg
@ -14,30 +14,20 @@
|
|||||||
height="96"
|
height="96"
|
||||||
id="svg6517"
|
id="svg6517"
|
||||||
version="1.1"
|
version="1.1"
|
||||||
inkscape:version="0.48+devel r12274"
|
inkscape:version="0.48+devel r12304"
|
||||||
sodipodi:docname="Juju_charm_icon_template.svg">
|
sodipodi:docname="ceph01.svg.2013_04_25_16_07_37.0.svg">
|
||||||
<defs
|
<defs
|
||||||
id="defs6519">
|
id="defs6519">
|
||||||
<linearGradient
|
|
||||||
inkscape:collect="always"
|
|
||||||
xlink:href="#Background"
|
|
||||||
id="linearGradient6461"
|
|
||||||
gradientUnits="userSpaceOnUse"
|
|
||||||
x1="0"
|
|
||||||
y1="970.29498"
|
|
||||||
x2="144"
|
|
||||||
y2="970.29498"
|
|
||||||
gradientTransform="matrix(0,-0.66666669,0.6660448,0,-866.25992,731.29077)" />
|
|
||||||
<linearGradient
|
<linearGradient
|
||||||
id="Background">
|
id="Background">
|
||||||
<stop
|
<stop
|
||||||
id="stop4178"
|
id="stop4178"
|
||||||
offset="0"
|
offset="0"
|
||||||
style="stop-color:#b8b8b8;stop-opacity:1" />
|
style="stop-color:#22779e;stop-opacity:1" />
|
||||||
<stop
|
<stop
|
||||||
id="stop4180"
|
id="stop4180"
|
||||||
offset="1"
|
offset="1"
|
||||||
style="stop-color:#c9c9c9;stop-opacity:1" />
|
style="stop-color:#2991c0;stop-opacity:1" />
|
||||||
</linearGradient>
|
</linearGradient>
|
||||||
<filter
|
<filter
|
||||||
style="color-interpolation-filters:sRGB;"
|
style="color-interpolation-filters:sRGB;"
|
||||||
@ -128,6 +118,128 @@
|
|||||||
stdDeviation="0.71999962"
|
stdDeviation="0.71999962"
|
||||||
id="feGaussianBlur893" />
|
id="feGaussianBlur893" />
|
||||||
</filter>
|
</filter>
|
||||||
|
<style
|
||||||
|
id="style867"
|
||||||
|
type="text/css"><![CDATA[
|
||||||
|
.fil0 {fill:#1F1A17}
|
||||||
|
]]></style>
|
||||||
|
<linearGradient
|
||||||
|
inkscape:collect="always"
|
||||||
|
xlink:href="#linearGradient4439"
|
||||||
|
id="linearGradient908"
|
||||||
|
x1="-220"
|
||||||
|
y1="731.29077"
|
||||||
|
x2="-220"
|
||||||
|
y2="635.29077"
|
||||||
|
gradientUnits="userSpaceOnUse" />
|
||||||
|
<clipPath
|
||||||
|
id="clipPath16">
|
||||||
|
<path
|
||||||
|
id="path18"
|
||||||
|
d="m -9,-9 614,0 0,231 -614,0 0,-231 z" />
|
||||||
|
</clipPath>
|
||||||
|
<clipPath
|
||||||
|
id="clipPath116">
|
||||||
|
<path
|
||||||
|
id="path118"
|
||||||
|
d="m 91.7368,146.3253 -9.7039,-1.577 -8.8548,-3.8814 -7.5206,-4.7308 -7.1566,-8.7335 -4.0431,-4.282 -3.9093,-1.4409 -1.034,2.5271 1.8079,2.6096 0.4062,3.6802 1.211,-0.0488 1.3232,-1.2069 -0.3569,3.7488 -1.4667,0.9839 0.0445,1.4286 -3.4744,-1.9655 -3.1462,-3.712 -0.6559,-3.3176 1.3453,-2.6567 1.2549,-4.5133 2.5521,-1.2084 2.6847,0.1318 2.5455,1.4791 -1.698,-8.6122 1.698,-9.5825 -1.8692,-4.4246 -6.1223,-6.5965 1.0885,-3.941 2.9002,-4.5669 5.4688,-3.8486 2.9007,-0.3969 3.225,-0.1094 -2.012,-8.2601 7.3993,-3.0326 9.2188,-1.2129 3.1535,2.0619 0.2427,5.5797 3.5178,5.8224 0.2426,4.6094 8.4909,-0.6066 7.8843,0.7279 -7.8843,-4.7307 1.3343,-5.701 4.9731,-7.763 4.8521,-2.0622 3.8814,1.5769 1.577,3.1538 8.1269,6.1861 1.5769,-1.3343 12.7363,-0.485 2.5473,2.0619 0.2426,3.6391 -0.849,1.5767 -0.6066,9.8251 -4.2454,8.4909 0.7276,3.7605 2.5475,-1.3343 7.1566,-6.6716 3.5175,-0.2424 3.8815,1.5769 3.8818,2.9109 1.9406,6.3077 11.4021,-0.7277 6.914,2.6686 5.5797,5.2157 4.0028,7.5206 0.9706,8.8546 -0.8493,10.3105 -2.1832,9.2185 -2.1836,2.9112 -3.0322,0.9706 -5.3373,-5.8224 -4.8518,-1.6982 -4.2455,7.0353 -4.2454,3.8815 -2.3049,1.4556 -9.2185,7.6419 -7.3993,4.0028 -7.3993,0.6066 -8.6119,-1.4556 -7.5206,-2.7899 -5.2158,-4.2454 -4.1241,-4.9734 -4.2454,-1.2129" />
|
||||||
|
</clipPath>
|
||||||
|
<clipPath
|
||||||
|
id="clipPath128">
|
||||||
|
<path
|
||||||
|
id="path130"
|
||||||
|
d="m 91.7368,146.3253 -9.7039,-1.577 -8.8548,-3.8814 -7.5206,-4.7308 -7.1566,-8.7335 -4.0431,-4.282 -3.9093,-1.4409 -1.034,2.5271 1.8079,2.6096 0.4062,3.6802 1.211,-0.0488 1.3232,-1.2069 -0.3569,3.7488 -1.4667,0.9839 0.0445,1.4286 -3.4744,-1.9655 -3.1462,-3.712 -0.6559,-3.3176 1.3453,-2.6567 1.2549,-4.5133 2.5521,-1.2084 2.6847,0.1318 2.5455,1.4791 -1.698,-8.6122 1.698,-9.5825 -1.8692,-4.4246 -6.1223,-6.5965 1.0885,-3.941 2.9002,-4.5669 5.4688,-3.8486 2.9007,-0.3969 3.225,-0.1094 -2.012,-8.2601 7.3993,-3.0326 9.2188,-1.2129 3.1535,2.0619 0.2427,5.5797 3.5178,5.8224 0.2426,4.6094 8.4909,-0.6066 7.8843,0.7279 -7.8843,-4.7307 1.3343,-5.701 4.9731,-7.763 4.8521,-2.0622 3.8814,1.5769 1.577,3.1538 8.1269,6.1861 1.5769,-1.3343 12.7363,-0.485 2.5473,2.0619 0.2426,3.6391 -0.849,1.5767 -0.6066,9.8251 -4.2454,8.4909 0.7276,3.7605 2.5475,-1.3343 7.1566,-6.6716 3.5175,-0.2424 3.8815,1.5769 3.8818,2.9109 1.9406,6.3077 11.4021,-0.7277 6.914,2.6686 5.5797,5.2157 4.0028,7.5206 0.9706,8.8546 -0.8493,10.3105 -2.1832,9.2185 -2.1836,2.9112 -3.0322,0.9706 -5.3373,-5.8224 -4.8518,-1.6982 -4.2455,7.0353 -4.2454,3.8815 -2.3049,1.4556 -9.2185,7.6419 -7.3993,4.0028 -7.3993,0.6066 -8.6119,-1.4556 -7.5206,-2.7899 -5.2158,-4.2454 -4.1241,-4.9734 -4.2454,-1.2129" />
|
||||||
|
</clipPath>
|
||||||
|
<linearGradient
|
||||||
|
id="linearGradient3850"
|
||||||
|
inkscape:collect="always">
|
||||||
|
<stop
|
||||||
|
id="stop3852"
|
||||||
|
offset="0"
|
||||||
|
style="stop-color:#000000;stop-opacity:1;" />
|
||||||
|
<stop
|
||||||
|
id="stop3854"
|
||||||
|
offset="1"
|
||||||
|
style="stop-color:#000000;stop-opacity:0;" />
|
||||||
|
</linearGradient>
|
||||||
|
<clipPath
|
||||||
|
clipPathUnits="userSpaceOnUse"
|
||||||
|
id="clipPath3095">
|
||||||
|
<path
|
||||||
|
d="m 976.648,389.551 -842.402,0 0,839.999 842.402,0 0,-839.999"
|
||||||
|
id="path3097"
|
||||||
|
inkscape:connector-curvature="0" />
|
||||||
|
</clipPath>
|
||||||
|
<linearGradient
|
||||||
|
id="linearGradient4439"
|
||||||
|
inkscape:collect="always">
|
||||||
|
<stop
|
||||||
|
id="stop4441"
|
||||||
|
offset="0"
|
||||||
|
style="stop-color:#e3e3e3;stop-opacity:1" />
|
||||||
|
<stop
|
||||||
|
id="stop4443"
|
||||||
|
offset="1"
|
||||||
|
style="stop-color:#efefef;stop-opacity:1" />
|
||||||
|
</linearGradient>
|
||||||
|
<clipPath
|
||||||
|
clipPathUnits="userSpaceOnUse"
|
||||||
|
id="clipPath3195">
|
||||||
|
<path
|
||||||
|
d="m 611.836,756.738 -106.34,105.207 c -8.473,8.289 -13.617,20.102 -13.598,33.379 L 598.301,790.207 c -0.031,-13.418 5.094,-25.031 13.535,-33.469"
|
||||||
|
id="path3197"
|
||||||
|
inkscape:connector-curvature="0" />
|
||||||
|
</clipPath>
|
||||||
|
<clipPath
|
||||||
|
clipPathUnits="userSpaceOnUse"
|
||||||
|
id="clipPath3235">
|
||||||
|
<path
|
||||||
|
d="m 1095.64,1501.81 c 35.46,-35.07 70.89,-70.11 106.35,-105.17 4.4,-4.38 7.11,-10.53 7.11,-17.55 l -106.37,105.21 c 0,7 -2.71,13.11 -7.09,17.51"
|
||||||
|
id="path3237"
|
||||||
|
inkscape:connector-curvature="0" />
|
||||||
|
</clipPath>
|
||||||
|
<clipPath
|
||||||
|
id="clipPath4591"
|
||||||
|
clipPathUnits="userSpaceOnUse">
|
||||||
|
<path
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
d="m 1106.6009,730.43734 -0.036,21.648 c -0.01,3.50825 -2.8675,6.61375 -6.4037,6.92525 l -83.6503,7.33162 c -3.5205,0.30763 -6.3812,-2.29987 -6.3671,-5.8145 l 0.036,-21.6475 20.1171,-1.76662 -0.011,4.63775 c 0,1.83937 1.4844,3.19925 3.3262,3.0395 l 49.5274,-4.33975 c 1.8425,-0.166 3.3425,-1.78125 3.3538,-3.626 l 0.01,-4.63025 20.1,-1.7575"
|
||||||
|
style="fill:#ff00ff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||||
|
id="path4593" />
|
||||||
|
</clipPath>
|
||||||
|
<radialGradient
|
||||||
|
gradientUnits="userSpaceOnUse"
|
||||||
|
gradientTransform="matrix(-1.4333926,-2.2742838,1.1731823,-0.73941125,-174.08025,98.374394)"
|
||||||
|
r="20.40658"
|
||||||
|
fy="93.399292"
|
||||||
|
fx="-26.508606"
|
||||||
|
cy="93.399292"
|
||||||
|
cx="-26.508606"
|
||||||
|
id="radialGradient3856"
|
||||||
|
xlink:href="#linearGradient3850"
|
||||||
|
inkscape:collect="always" />
|
||||||
|
<linearGradient
|
||||||
|
gradientTransform="translate(-318.48033,212.32022)"
|
||||||
|
gradientUnits="userSpaceOnUse"
|
||||||
|
y2="993.19702"
|
||||||
|
x2="-51.879555"
|
||||||
|
y1="593.11615"
|
||||||
|
x1="348.20132"
|
||||||
|
id="linearGradient3895"
|
||||||
|
xlink:href="#linearGradient3850"
|
||||||
|
inkscape:collect="always" />
|
||||||
|
<clipPath
|
||||||
|
id="clipPath3906"
|
||||||
|
clipPathUnits="userSpaceOnUse">
|
||||||
|
<rect
|
||||||
|
transform="scale(1,-1)"
|
||||||
|
style="opacity:0.8;color:#000000;fill:#ff00ff;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
|
||||||
|
id="rect3908"
|
||||||
|
width="1019.1371"
|
||||||
|
height="1019.1371"
|
||||||
|
x="357.9816"
|
||||||
|
y="-1725.8152" />
|
||||||
|
</clipPath>
|
||||||
</defs>
|
</defs>
|
||||||
<sodipodi:namedview
|
<sodipodi:namedview
|
||||||
id="base"
|
id="base"
|
||||||
@ -136,12 +248,12 @@
|
|||||||
borderopacity="1.0"
|
borderopacity="1.0"
|
||||||
inkscape:pageopacity="0.0"
|
inkscape:pageopacity="0.0"
|
||||||
inkscape:pageshadow="2"
|
inkscape:pageshadow="2"
|
||||||
inkscape:zoom="4.0745362"
|
inkscape:zoom="3.2596289"
|
||||||
inkscape:cx="18.514671"
|
inkscape:cx="55.171524"
|
||||||
inkscape:cy="49.018169"
|
inkscape:cy="27.879339"
|
||||||
inkscape:document-units="px"
|
inkscape:document-units="px"
|
||||||
inkscape:current-layer="layer1"
|
inkscape:current-layer="layer1"
|
||||||
showgrid="true"
|
showgrid="false"
|
||||||
fit-margin-top="0"
|
fit-margin-top="0"
|
||||||
fit-margin-left="0"
|
fit-margin-left="0"
|
||||||
fit-margin-right="0"
|
fit-margin-right="0"
|
||||||
@ -152,9 +264,22 @@
|
|||||||
inkscape:window-y="24"
|
inkscape:window-y="24"
|
||||||
inkscape:window-maximized="1"
|
inkscape:window-maximized="1"
|
||||||
showborder="true"
|
showborder="true"
|
||||||
showguides="true"
|
showguides="false"
|
||||||
inkscape:guide-bbox="true"
|
inkscape:guide-bbox="true"
|
||||||
inkscape:showpageshadow="false">
|
inkscape:showpageshadow="false"
|
||||||
|
inkscape:snap-global="true"
|
||||||
|
inkscape:snap-bbox="true"
|
||||||
|
inkscape:bbox-paths="true"
|
||||||
|
inkscape:bbox-nodes="true"
|
||||||
|
inkscape:snap-bbox-edge-midpoints="true"
|
||||||
|
inkscape:snap-bbox-midpoints="true"
|
||||||
|
inkscape:object-paths="true"
|
||||||
|
inkscape:snap-intersection-paths="true"
|
||||||
|
inkscape:object-nodes="true"
|
||||||
|
inkscape:snap-smooth-nodes="true"
|
||||||
|
inkscape:snap-midpoints="true"
|
||||||
|
inkscape:snap-object-midpoints="true"
|
||||||
|
inkscape:snap-center="true">
|
||||||
<inkscape:grid
|
<inkscape:grid
|
||||||
type="xygrid"
|
type="xygrid"
|
||||||
id="grid821" />
|
id="grid821" />
|
||||||
@ -194,11 +319,21 @@
|
|||||||
transform="translate(268,-635.29076)"
|
transform="translate(268,-635.29076)"
|
||||||
style="display:inline">
|
style="display:inline">
|
||||||
<path
|
<path
|
||||||
style="fill:url(#linearGradient6461);fill-opacity:1;stroke:none;display:inline;filter:url(#filter1121)"
|
style="fill:url(#linearGradient908);fill-opacity:1.0;stroke:none;display:inline;filter:url(#filter1121)"
|
||||||
d="m -268,700.15563 0,-33.72973 c 0,-27.24324 3.88785,-31.13513 31.10302,-31.13513 l 33.79408,0 c 27.21507,0 31.1029,3.89189 31.1029,31.13513 l 0,33.72973 c 0,27.24325 -3.88783,31.13514 -31.1029,31.13514 l -33.79408,0 C -264.11215,731.29077 -268,727.39888 -268,700.15563 Z"
|
d="m -268,700.15563 0,-33.72973 c 0,-27.24324 3.88785,-31.13513 31.10302,-31.13513 l 33.79408,0 c 27.21507,0 31.1029,3.89189 31.1029,31.13513 l 0,33.72973 c 0,27.24325 -3.88783,31.13514 -31.1029,31.13514 l -33.79408,0 C -264.11215,731.29077 -268,727.39888 -268,700.15563 Z"
|
||||||
id="path6455"
|
id="path6455"
|
||||||
inkscape:connector-curvature="0"
|
inkscape:connector-curvature="0"
|
||||||
sodipodi:nodetypes="sssssssss" />
|
sodipodi:nodetypes="sssssssss" />
|
||||||
|
<path
|
||||||
|
style="color:#000000;fill:#f05c56;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:12;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
|
||||||
|
d="M 48 17 C 30.879173 17 17 30.879173 17 48 C 17 58.205647 21.921021 67.257453 29.53125 72.90625 C 31.106248 70.853104 31.792246 69.428164 32 68.65625 C 32.24185 67.75765 32.1873 67.60443 31.96875 66.875 C 31.775272 66.229265 30.9225 65.268196 29.5625 63.40625 C 29.543376 63.380067 29.519319 63.339038 29.5 63.3125 C 29.490587 63.301137 29.478142 63.29263 29.46875 63.28125 C 28.411032 61.999592 27.526437 60.578409 26.75 59.09375 C 25.013179 55.772698 24 52.007471 24 48 C 24 40.95011 27.065992 34.640853 31.90625 30.25 C 36.166391 26.385401 41.795056 24 48 24 C 54.213203 24 59.862908 26.376233 64.125 30.25 C 64.693279 30.766502 65.233498 31.306721 65.75 31.875 C 65.76468 31.891254 65.766619 31.92121 65.78125 31.9375 C 69.628213 36.193847 72 41.810964 72 48 C 72 53.79899 69.954991 59.132635 66.53125 63.28125 C 66.523757 63.291557 66.507464 63.302247 66.5 63.3125 C 66.476288 63.341126 66.461343 63.377737 66.4375 63.40625 C 65.0775 65.268196 64.224728 66.229265 64.03125 66.875 C 63.8127 67.60443 63.75815 67.75765 64 68.65625 C 64.207754 69.428164 64.893752 70.853104 66.46875 72.90625 C 74.078979 67.257453 79 58.205647 79 48 C 79 30.879173 65.120827 17 48 17 z M 48 30 C 44.47123 30.006 41.00461 31.05306 38.0625 33 C 29.81314 38.45904 27.5261 49.65783 32.96875 57.90625 C 32.97675 57.91845 32.992 57.9254 33 57.9375 C 34.69385 60.49644 36.81536 62.34977 37.65625 65.15625 C 38.417511 67.69696 38.464725 70.888363 34.6875 76 C 36.843125 77.026739 39.136156 77.803912 41.53125 78.3125 C 45.121429 72.505399 45.6 67.244681 44.375 63.15625 C 42.8785 58.16169 39.28615 54.78175 38.8125 54.0625 L 38.84375 54.0625 C 35.46092 48.96255 36.83156 42.19137 41.9375 38.8125 C 43.73298 37.62434 45.84671 37.00604 48 37 C 48.0104 37 48.02095 36.99997 48.03125 37 C 50.18163 37.006 52.26946 37.62456 54.0625 38.8125 C 59.16152 42.19075 60.56575 48.96347 57.1875 54.0625 C 56.71385 54.78175 53.1215 58.16169 51.625 63.15625 C 50.4 67.244681 50.878571 72.505399 54.46875 78.3125 C 56.863844 77.803912 59.156875 77.026739 61.3125 76 C 57.535275 70.888363 57.582489 67.69696 58.34375 65.15625 C 59.18464 62.34977 61.30615 60.49644 63 57.9375 C 68.46768 49.68475 66.19025 38.46769 57.9375 33 C 54.99872 31.05298 51.55602 30.00613 48.03125 30 C 48.0209 30.00003 48.0105 30 48 30 z M 48 43 C 45.238576 43 43 45.238576 43 48 C 43 50.761424 45.238576 53 48 53 C 50.761424 53 53 50.761424 53 48 C 53 45.238576 50.761424 43 48 43 z M 48 78.6875 C 47.94945 78.791177 47.895343 78.896359 47.84375 79 C 47.896122 79.00026 47.947567 79 48 79 C 48.052433 79 48.103878 79.00026 48.15625 79 C 48.104657 78.896359 48.05055 78.791177 48 78.6875 z "
|
||||||
|
transform="translate(-268,635.29076)"
|
||||||
|
id="path939" />
|
||||||
|
<path
|
||||||
|
style="color:#000000;fill:#dd322b;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:12;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
|
||||||
|
d="M 48 17 C 30.879173 17 17 30.879173 17 48 C 17 48.125345 16.99852 48.250008 17 48.375 C 17.334303 31.543929 31.088903 18 48 18 C 64.911097 18 78.665697 31.543929 79 48.375 C 79.00148 48.250008 79 48.125345 79 48 C 79 30.879173 65.120827 17 48 17 z M 48 30 C 44.47123 30.006 41.00461 31.05306 38.0625 33 C 32.70971 36.542226 29.880485 42.49862 30.03125 48.5 C 30.204405 42.846736 33.009903 37.343572 38.0625 34 C 41.00461 32.05306 44.47123 31.006 48 31 C 48.0105 31 48.02105 31.00008 48.03125 31 C 51.55602 31.00613 54.99872 32.05298 57.9375 34 C 62.975581 37.337877 65.755795 42.827998 65.9375 48.46875 C 66.07621 42.48142 63.273758 36.535428 57.9375 33 C 54.99872 31.05298 51.55602 30.00613 48.03125 30 C 48.0209 30.00003 48.0105 30 48 30 z M 48 43 C 45.238576 43 43 45.238576 43 48 C 43 48.172589 43.01418 48.331915 43.03125 48.5 C 43.2873 45.978722 45.411169 44 48 44 C 50.588831 44 52.7127 45.978722 52.96875 48.5 C 52.98582 48.331915 53 48.172589 53 48 C 53 45.238576 50.761424 43 48 43 z M 24 48.375 C 23.994609 48.583358 24 48.790301 24 49 C 24 53.00747 25.01318 56.7727 26.75 60.09375 C 27.52644 61.57841 28.41103 62.99959 29.46875 64.28125 C 29.47805 64.29255 29.491 64.3011 29.5 64.3125 C 29.5193 64.339 29.5434 64.38005 29.5625 64.40625 C 30.9225 66.2682 31.77527 67.22927 31.96875 67.875 C 32.016575 68.034657 32.063023 68.162945 32.09375 68.28125 C 32.215432 67.710404 32.150661 67.482143 31.96875 66.875 C 31.775272 66.229265 30.9225 65.268196 29.5625 63.40625 C 29.543376 63.380067 29.519319 63.339038 29.5 63.3125 C 29.490587 63.301137 29.478142 63.29263 29.46875 63.28125 C 28.411032 61.999592 27.526437 60.578409 26.75 59.09375 C 25.067361 55.876301 24.060969 52.242622 24 48.375 z M 71.96875 48.375 C 71.881931 54.027547 69.880433 59.222978 66.53125 63.28125 C 66.523757 63.291557 66.507464 63.302247 66.5 63.3125 C 66.476288 63.341126 66.461343 63.377737 66.4375 63.40625 C 65.0775 65.268196 64.224728 66.229265 64.03125 66.875 C 63.849339 67.482143 63.784568 67.710404 63.90625 68.28125 C 63.936983 68.162945 63.983414 68.034657 64.03125 67.875 C 64.22473 67.22927 65.0775 66.2682 66.4375 64.40625 C 66.4613 64.37775 66.4763 64.3411 66.5 64.3125 C 66.5074 64.3023 66.52425 64.29155 66.53125 64.28125 C 69.95499 60.13264 72 54.79899 72 49 C 72 48.790781 71.974136 48.582881 71.96875 48.375 z M 37.03125 48.5625 C 36.950597 50.780966 37.510968 53.053199 38.84375 55.0625 L 38.8125 55.0625 C 39.28615 55.78175 42.8785 59.16169 44.375 64.15625 C 44.74962 65.406541 44.953039 66.767092 44.96875 68.21875 C 45.062756 66.388889 44.834375 64.689412 44.375 63.15625 C 42.8785 58.16169 39.28615 54.78175 38.8125 54.0625 L 38.84375 54.0625 C 37.712059 52.356364 37.137075 50.453131 37.03125 48.5625 z M 59 48.5625 C 58.899597 50.453201 58.317659 52.356672 57.1875 54.0625 C 56.71385 54.78175 53.1215 58.16169 51.625 63.15625 C 51.165625 64.689412 50.937244 66.388889 51.03125 68.21875 C 51.046961 66.767092 51.25038 65.406541 51.625 64.15625 C 53.1215 59.16169 56.71385 55.78175 57.1875 55.0625 C 58.518478 53.053561 59.087212 50.781084 59 48.5625 z M 38.03125 68.5 C 37.866539 70.476556 36.990243 72.883747 34.6875 76 C 34.858955 76.081665 35.045574 76.140252 35.21875 76.21875 C 37.469311 72.948813 38.106912 70.501999 38.03125 68.5 z M 57.96875 68.5 C 57.893088 70.501999 58.530689 72.948813 60.78125 76.21875 C 60.954426 76.140252 61.141045 76.081665 61.3125 76 C 59.009757 72.883747 58.133461 70.476556 57.96875 68.5 z M 48 78.6875 C 47.94945 78.791177 47.895343 78.896359 47.84375 79 C 47.896122 79.00026 47.947567 79 48 79 C 48.052433 79 48.103878 79.00026 48.15625 79 C 48.104657 78.896359 48.05055 78.791177 48 78.6875 z "
|
||||||
|
transform="translate(-268,635.29076)"
|
||||||
|
id="path899" />
|
||||||
</g>
|
</g>
|
||||||
<g
|
<g
|
||||||
inkscape:groupmode="layer"
|
inkscape:groupmode="layer"
|
||||||
@ -225,7 +360,7 @@
|
|||||||
style="opacity:0.6;filter:url(#filter891)">
|
style="opacity:0.6;filter:url(#filter891)">
|
||||||
<path
|
<path
|
||||||
transform="matrix(1.4999992,0,0,1.4999992,-29.999795,-237.54282)"
|
transform="matrix(1.4999992,0,0,1.4999992,-29.999795,-237.54282)"
|
||||||
d="m 264,552.36218 a 12,12 0 1 1 -24,0 A 12,12 0 1 1 264,552.36218 Z"
|
d="m 264,552.36218 c 0,6.62742 -5.37258,12 -12,12 -6.62742,0 -12,-5.37258 -12,-12 0,-6.62741 5.37258,-12 12,-12 C 258.62742,540.36218 264,545.73477 264,552.36218 Z"
|
||||||
sodipodi:ry="12"
|
sodipodi:ry="12"
|
||||||
sodipodi:rx="12"
|
sodipodi:rx="12"
|
||||||
sodipodi:cy="552.36218"
|
sodipodi:cy="552.36218"
|
||||||
@ -244,11 +379,11 @@
|
|||||||
sodipodi:cy="552.36218"
|
sodipodi:cy="552.36218"
|
||||||
sodipodi:rx="12"
|
sodipodi:rx="12"
|
||||||
sodipodi:ry="12"
|
sodipodi:ry="12"
|
||||||
d="m 264,552.36218 a 12,12 0 1 1 -24,0 A 12,12 0 1 1 264,552.36218 Z"
|
d="m 264,552.36218 c 0,6.62742 -5.37258,12 -12,12 -6.62742,0 -12,-5.37258 -12,-12 0,-6.62741 5.37258,-12 12,-12 C 258.62742,540.36218 264,545.73477 264,552.36218 Z"
|
||||||
transform="matrix(1.4999992,0,0,1.4999992,-29.999795,-238.54282)" />
|
transform="matrix(1.4999992,0,0,1.4999992,-29.999795,-238.54282)" />
|
||||||
<path
|
<path
|
||||||
transform="matrix(1.25,0,0,1.25,33,-100.45273)"
|
transform="matrix(1.25,0,0,1.25,33,-100.45273)"
|
||||||
d="m 264,552.36218 a 12,12 0 1 1 -24,0 A 12,12 0 1 1 264,552.36218 Z"
|
d="m 264,552.36218 c 0,6.62742 -5.37258,12 -12,12 -6.62742,0 -12,-5.37258 -12,-12 0,-6.62741 5.37258,-12 12,-12 C 258.62742,540.36218 264,545.73477 264,552.36218 Z"
|
||||||
sodipodi:ry="12"
|
sodipodi:ry="12"
|
||||||
sodipodi:rx="12"
|
sodipodi:rx="12"
|
||||||
sodipodi:cy="552.36218"
|
sodipodi:cy="552.36218"
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 9.9 KiB After Width: | Height: | Size: 23 KiB |
@ -1,4 +1,4 @@
|
|||||||
includes: ['layer:apt', 'layer:ceph-base', 'interface:ceph-mds'] # if you use any interfaces, add them here
|
includes: ['layer:apt', 'layer:ceph-base', 'interface:ceph-mds']
|
||||||
options:
|
options:
|
||||||
apt:
|
apt:
|
||||||
packages:
|
packages:
|
||||||
|
|||||||
@ -81,14 +81,10 @@ class CephFsBasicDeployment(OpenStackAmuletDeployment):
|
|||||||
"""Configure all of the services.
|
"""Configure all of the services.
|
||||||
:param **kwargs:
|
:param **kwargs:
|
||||||
"""
|
"""
|
||||||
# Include a non-existent device as osd-devices is a whitelist,
|
# NOTE(jamespage): fix fsid to allow later validation
|
||||||
# and this will catch cases where proposals attempt to change that.
|
|
||||||
ceph_mon_config = {
|
ceph_mon_config = {
|
||||||
'monitor-count': '3',
|
|
||||||
'auth-supported': 'none',
|
|
||||||
'fsid': '6547bd3e-1397-11e2-82e5-53567c8d32dc',
|
'fsid': '6547bd3e-1397-11e2-82e5-53567c8d32dc',
|
||||||
}
|
}
|
||||||
|
|
||||||
# Include a non-existent device as osd-devices is a whitelist,
|
# Include a non-existent device as osd-devices is a whitelist,
|
||||||
# and this will catch cases where proposals attempt to change that.
|
# and this will catch cases where proposals attempt to change that.
|
||||||
ceph_osd_config = {
|
ceph_osd_config = {
|
||||||
@ -184,9 +180,9 @@ class CephFsBasicDeployment(OpenStackAmuletDeployment):
|
|||||||
'err to syslog': 'false',
|
'err to syslog': 'false',
|
||||||
'clog to syslog': 'false',
|
'clog to syslog': 'false',
|
||||||
'mon cluster log to syslog': 'false',
|
'mon cluster log to syslog': 'false',
|
||||||
'auth cluster required': 'none',
|
'auth cluster required': 'cephx',
|
||||||
'auth service required': 'none',
|
'auth service required': 'cephx',
|
||||||
'auth client required': 'none'
|
'auth client required': 'cephx'
|
||||||
},
|
},
|
||||||
'mon': {
|
'mon': {
|
||||||
'keyring': '/var/lib/ceph/mon/$cluster-$id/keyring'
|
'keyring': '/var/lib/ceph/mon/$cluster-$id/keyring'
|
||||||
|
|||||||
@ -1 +1,3 @@
|
|||||||
|
netifaces
|
||||||
|
dnspython3
|
||||||
ceph_api
|
ceph_api
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user