openstack/kolla-ansible
Code Issues Proposed changes

Merge "Convert ceph to json"

Browse Source
This commit is contained in:
Jenkins 2015-09-28 11:26:26 +00:00 committed by Gerrit Code Review
commit e69571eeb3
8 changed files with 62 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ansible/roles/ceph/tasks/config.yml
View File

@ -10,6 +10,11 @@
- "{{ node_templates_directory }}/{{ service_name }}/ceph.conf_augment"
config_dest: "{{ node_config_directory }}/{{ service_name }}/ceph.conf"
- name: Copying over ceph-mon JSON configuration file
template:
src: "ceph-mon.json.j2"
dest: "{{ node_config_directory }}/ceph-mon/config.json"
- include: ../../config.yml
vars:
service_name: "ceph-osd"
@ -20,3 +25,8 @@
- "{{ node_templates_directory }}/{{ service_name }}/ceph.conf_minimal"
- "{{ node_templates_directory }}/{{ service_name }}/ceph.conf_augment"
config_dest: "{{ node_config_directory }}/{{ service_name }}/ceph.conf"
- name: Copying over ceph-osd JSON configuration file
template:
src: "ceph-osd.json.j2"
dest: "{{ node_config_directory }}/ceph-osd/config.json"

1
ansible/roles/ceph/tasks/start_mons.yml
View File

@ -18,5 +18,4 @@
- "ceph_mon_data"
env:
KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
MON_IP: "{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}"
when: inventory_hostname in groups['ceph-mon']

32
ansible/roles/ceph/templates/ceph-mon.json.j2 Normal file
View File

@ -0,0 +1,32 @@
{
"command": "/usr/bin/ceph-mon -d -i {{ ansible_hostname }} --public-addr {{ hostvars[inventory_hostname]['ansible_' + storage_interface]['ipv4']['address'] }}:6789",
"config_files": [
{
"source": "/opt/kolla/config_files/ceph.conf",
"dest": "/etc/ceph/ceph.conf",
"owner": "glance",
"perm": "0600"
}
{
"source": "/opt/kolla/config_files/ceph.client.admin.keyring",
"dest": "/etc/ceph/ceph.client.admin.keyring",
"owner": "ceph",
"perm": "0600"
"optional": True
},
{
"source": "/opt/kolla/config_files/ceph.client.mon.keyring",
"dest": "/etc/ceph/ceph.client.mon.keyring",
"owner": "ceph",
"perm": "0600"
"optional": True
},
{
"source": "/opt/kolla/config_files/ceph.monmap",
"dest": "/etc/ceph/ceph.monmap",
"owner": "ceph",
"perm": "0600"
"optional": True
}
]
}

17
ansible/roles/ceph/templates/ceph-osd.json.j2 Normal file
View File

@ -0,0 +1,17 @@
{
"command": "/usr/bin/ceph-osd -f -d",
"config_files": [
{
"source": "/opt/kolla/config_files/ceph.conf",
"dest": "/etc/ceph/ceph.conf",
"owner": "glance",
"perm": "0600"
},
{
"source": "/opt/kolla/config_files/ceph.client.admin.keyring",
"dest": "/etc/ceph/ceph.client.admin.keyring",
"owner": "ceph",
"perm": "0600"
}
]
}

40
docker/ceph/ceph-mon/config-external.sh
View File

@ -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

5
docker/ceph/ceph-mon/start.sh
View File

@ -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

20
docker/ceph/ceph-osd/config-external.sh
View File

@ -1,20 +0,0 @@
#!/bin/bash
SOURCE="/opt/kolla/ceph-osd/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-osd/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

7
docker/ceph/ceph-osd/start.sh
View File

@ -7,11 +7,9 @@ source /opt/kolla/kolla-common.sh
# Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases
# of the KOLLA_BOOTSTRAP variable being set, including empty.
if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
JOURNAL_PARTUUID=$(uuidgen)
# Formating disk for ceph
sgdisk --zap-all -- "${OSD_DEV}"
sgdisk --new=2:1M:5G --change-name=2:KOLLA_CEPH_JOURNAL --typecode=2:45B0969E-9B03-4F30-B4C6-B4B80CEFF106 --partition-guid=2:${JOURNAL_PARTUUID} --mbrtogpt -- "${OSD_DEV}"
sgdisk --new=2:1M:5G --change-name=2:KOLLA_CEPH_JOURNAL --typecode=2:45B0969E-9B03-4F30-B4C6-B4B80CEFF106 --mbrtogpt -- "${OSD_DEV}"
sgdisk --largest-new=1 --change-name=1:KOLLA_CEPH_DATA --typecode=1:4FBD7E29-9D25-41B8-AFD0-062C0CEFF05D -- "${OSD_DEV}"
# This command may throw errors that we can safely ignore
partprobe || true
@ -45,7 +43,6 @@ fi
# We look up the appropriate journal since we cannot rely on symlinks
JOURNAL_PARTITION=$(ls "${OSD_DEV}"* | egrep "${OSD_DEV}p?2")
OSD_DIR="/var/lib/ceph/osd/ceph-${OSD_ID}"
CMD="/usr/bin/ceph-osd"
ARGS="-f -d -i ${OSD_ID} --osd-journal ${JOURNAL_PARTITION} -k ${OSD_DIR}/keyring"
ARGS="-i ${OSD_ID} --osd-journal ${JOURNAL_PARTITION} -k ${OSD_DIR}/keyring"
exec $CMD $ARGS