ceph: add RGW to embedded ceph

this commit adds RGW to rook.
This commit is contained in:
Bassam Tabbara committed 2016-11-28 09:10:43 -08:00
1 parent 2b1806aea4
commit cfdd7d800c
4 files changed
+7 -4

No files matched your search

+1
View File
@@ -40,6 +40,7 @@ CEPHD_CMAKE += \
-DALLOCATOR=$(CEPHD_ALLOCATOR) \
-DWITH_FUSE=OFF \
-DWITH_NSS=OFF \
-DWITH_SYSTEM_BOOST=ON \
-DUSE_CRYPTOPP=ON \
-DWITH_LEVELDB=OFF \
-DWITH_XFS=OFF \
+1 -1
Submodule ceph updated: e62bc8f1ba...5e221dbee4.
+1 -1
View File
@@ -47,7 +47,7 @@ func runDaemon(cmd *cobra.Command, args []string) error {
if err := flags.VerifyRequiredFlags(daemonCmd, []string{"type"}); err != nil {
return err
}
if daemonType != "mon" && daemonType != "osd" && daemonType != "mds" {
if daemonType != "mon" && daemonType != "osd" && daemonType != "mds" && daemonType != "rgw" {
return fmt.Errorf("unknown daemon type: %s", daemonType)
}
+4 -2
View File
@@ -48,8 +48,8 @@ package cephd
// #cgo tcmalloc,dynamic LDFLAGS: -Wl,-Bstatic -ltcmalloc_minimal -Wl,-Bdynamic
// #cgo jemalloc tcmalloc CFLAGS: -fno-builtin-malloc -fno-builtin-calloc -fno-builtin-realloc -fno-builtin-free
// #cgo jemalloc tcmalloc CXXFLAGS: -fno-builtin-malloc -fno-builtin-calloc -fno-builtin-realloc -fno-builtin-free
// #cgo static LDFLAGS: -Wl,--whole-archive -lpthread -Wl,--no-whole-archive -lcephd -lboost_system -lboost_thread -lboost_iostreams -lboost_random -lblkid -lz -lsnappy -lcrypto++ -laio -luuid -lm -ldl -lresolv
// #cgo dynamic LDFLAGS: -Wl,-Bstatic -lcephd -lboost_system -lboost_thread -lboost_iostreams -lboost_random -lblkid -lz -lsnappy -lcrypto++ -laio -luuid -Wl,-Bdynamic -ldl -lm -lresolv
// #cgo static LDFLAGS: -Wl,--whole-archive -lpthread -Wl,--no-whole-archive -lcephd -lboost_system -lboost_thread -lboost_iostreams -lboost_random -lblkid -lz -lsnappy -lcrypto++ -laio -luuid -lcurl -lfcgi -lexpat -lm -ldl -lresolv
// #cgo dynamic LDFLAGS: -Wl,-Bstatic -lcephd -lboost_system -lboost_thread -lboost_iostreams -lboost_random -lblkid -lz -lsnappy -lcrypto++ -laio -luuid -lcurl -lfcgi -lexpat -Wl,-Bdynamic -ldl -lm -lresolv
// #include <errno.h>
// #include <stdlib.h>
// #include <string.h>
@@ -157,6 +157,8 @@ func (c *ceph) RunDaemon(daemon string, args ...string) error {
ret = C.cephd_run_osd(C.int(len(finalArgs)), (**C.char)(ptr))
} else if daemon == "mds" {
ret = C.cephd_run_mds(C.int(len(finalArgs)), (**C.char)(ptr))
} else if daemon == "rgw" {
ret = C.cephd_run_rgw(C.int(len(finalArgs)), (**C.char)(ptr))
}
if ret < 0 {
return GetCephdError(int(ret))