diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-09-28 11:26:26 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-09-28 11:26:26 +0000 |
| commit | e69571eeb3729907be2ea6acb80904c4790a6916 (patch) | |
| tree | 28e0044ab7bf86a1ce63279e0002e7f993680e0f /docker/ceph/ceph-mon | |
| parent | 6c1e4e02073e2e64b387fd62104d91ed7d1aeffd (diff) | |
| parent | 83d195249ebb7250f1531e865ee962944997e9bd (diff) | |
| download | kolla-e69571eeb3729907be2ea6acb80904c4790a6916.tar.gz kolla-e69571eeb3729907be2ea6acb80904c4790a6916.zip | |
Merge "Convert ceph to json"
Diffstat (limited to 'docker/ceph/ceph-mon')
| -rw-r--r-- | docker/ceph/ceph-mon/config-external.sh | 40 | ||||
| -rwxr-xr-x | docker/ceph/ceph-mon/start.sh | 5 |
2 files changed, 1 insertions, 44 deletions
diff --git a/docker/ceph/ceph-mon/config-external.sh b/docker/ceph/ceph-mon/config-external.sh deleted file mode 100644 index 289cffc86..000000000 --- a/docker/ceph/ceph-mon/config-external.sh +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/bash -SOURCE="/opt/kolla/ceph-mon/ceph.conf" -TARGET="/etc/ceph/ceph.conf" -OWNER="ceph" - -if [[ -f "$SOURCE" ]]; then - cp $SOURCE $TARGET - chown ${OWNER}: $TARGET - chmod 0644 $TARGET -fi - -SOURCE="/opt/kolla/ceph-mon/ceph.client.admin.keyring" -TARGET="/etc/ceph/ceph.client.admin.keyring" -OWNER="ceph" - -if [[ -f "$SOURCE" ]]; then - cp $SOURCE $TARGET - chown ${OWNER}: $TARGET - chmod 0600 $TARGET -fi - -SOURCE="/opt/kolla/ceph-mon/ceph.client.mon.keyring" -TARGET="/etc/ceph/ceph.client.mon.keyring" -OWNER="ceph" - -if [[ -f "$SOURCE" ]]; then - cp $SOURCE $TARGET - chown ${OWNER}: $TARGET - chmod 0600 $TARGET -fi - -SOURCE="/opt/kolla/ceph-mon/ceph.monmap" -TARGET="/etc/ceph/ceph.monmap" -OWNER="ceph" - -if [[ -f "$SOURCE" ]]; then - cp $SOURCE $TARGET - chown ${OWNER}: $TARGET - chmod 0600 $TARGET -fi diff --git a/docker/ceph/ceph-mon/start.sh b/docker/ceph/ceph-mon/start.sh index f3eb35a59..29b2bd700 100755 --- a/docker/ceph/ceph-mon/start.sh +++ b/docker/ceph/ceph-mon/start.sh @@ -1,9 +1,6 @@ #!/bin/bash set -o errexit -CMD="/usr/bin/ceph-mon" -ARGS="-d -i $(hostname) --public-addr ${MON_IP}:6789" - # Setup common paths KEYRING_ADMIN="/etc/ceph/ceph.client.admin.keyring" KEYRING_MON="/etc/ceph/ceph.client.mon.keyring" @@ -41,4 +38,4 @@ if [[ ! -e "${MON_DIR}/keyring" ]]; then rm "${KEYRING_TMP}" fi -exec $CMD $ARGS +exec $CMD |