diff options
Diffstat (limited to 'deploy')
| -rw-r--r-- | deploy/adapters/ansible/roles/ceph-mon/tasks/install_mon.yml | 1 | ||||
| -rw-r--r-- | deploy/adapters/ansible/roles/ceph-osd/tasks/install_osd.yml | 5 | ||||
| -rw-r--r-- | deploy/conf/base.conf | 5 |
3 files changed, 6 insertions, 5 deletions
diff --git a/deploy/adapters/ansible/roles/ceph-mon/tasks/install_mon.yml b/deploy/adapters/ansible/roles/ceph-mon/tasks/install_mon.yml index 279eb786..3b818ea2 100644 --- a/deploy/adapters/ansible/roles/ceph-mon/tasks/install_mon.yml +++ b/deploy/adapters/ansible/roles/ceph-mon/tasks/install_mon.yml @@ -27,3 +27,4 @@ - name: fetch osd keyring fetch: src="/var/lib/ceph/bootstrap-osd/ceph.keyring" dest="/tmp/ceph.osd.keyring" flat=yes + run_once: True diff --git a/deploy/adapters/ansible/roles/ceph-osd/tasks/install_osd.yml b/deploy/adapters/ansible/roles/ceph-osd/tasks/install_osd.yml index 524f25da..9494e679 100644 --- a/deploy/adapters/ansible/roles/ceph-osd/tasks/install_osd.yml +++ b/deploy/adapters/ansible/roles/ceph-osd/tasks/install_osd.yml @@ -20,3 +20,8 @@ - name: activate osd node shell: ceph-disk activate /var/local/osd +- name: enable ceph service + service: name=ceph enabled=yes + +- name: rebuild osd after reboot + lineinfile: dest=/etc/init/ceph-osd-all-starter.conf insertafter="^task" line="pre-start script\n set -e\n /opt/setup_storage/losetup.sh\n sleep 3\n mount /dev/storage-volumes/ceph0 /var/local/osd\nend script" diff --git a/deploy/conf/base.conf b/deploy/conf/base.conf index f8de70ee..0c221e9e 100644 --- a/deploy/conf/base.conf +++ b/deploy/conf/base.conf @@ -18,11 +18,6 @@ export SUBNETS="10.1.0.0/24,172.16.2.0/24,172.16.3.0/24,172.16.4.0/24" export MANAGEMENT_IP_START=${MANAGEMENT_IP_START:-'10.1.0.50'} export MANAGEMENT_INTERFACE=${MANAGEMENT_INTERFACE:-eth0} export DASHBOARD_URL="" - -if [[ `echo $HOST_ROLES | grep odl` ]]; then - export ENABLE_SECGROUP="false" -fi - export ENABLE_SECGROUP=${ENABLE_SECGROUP:-"true"} export ENABLE_VPNAAS="false" export ENABLE_FWAAS="false" |