aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgrakiss <grakiss.wanglei@huawei.com>2016-01-04 16:04:01 +0800
committerJustin chi <chigang@huawei.com>2016-01-04 10:08:16 +0000
commit917b53a734ccf31d2117458708e83a22175538b5 (patch)
tree84c858bab3c2bb0a98c0b203bfec9557ba2feb45
parent0b4b86d37c6fd0946737d59bf1093398dde09670 (diff)
Fix: deploy ceph using mgmt network
JIRA: COMPASS-238 - forget to change network from public install to mgmt Change-Id: I7a4540809782a391ac04e92811e837b32a67a0b2 Signed-off-by: grakiss <grakiss.wanglei@huawei.com>
-rw-r--r--deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml4
-rw-r--r--deploy/adapters/ansible/roles/ceph-deploy/tasks/ceph_install_Debian.yml2
-rw-r--r--deploy/conf/network_cfg.yaml2
3 files changed, 4 insertions, 4 deletions
diff --git a/deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml b/deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml
index d0eb1fea..199c14ab 100644
--- a/deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml
+++ b/deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml
@@ -77,8 +77,8 @@
- hosts: ceph_adm
remote_user: root
accelerate: true
- roles: []
- #- ceph-deploy
+ roles:
+ - ceph-deploy
- hosts: all
remote_user: root
diff --git a/deploy/adapters/ansible/roles/ceph-deploy/tasks/ceph_install_Debian.yml b/deploy/adapters/ansible/roles/ceph-deploy/tasks/ceph_install_Debian.yml
index 5c047566..79388f74 100644
--- a/deploy/adapters/ansible/roles/ceph-deploy/tasks/ceph_install_Debian.yml
+++ b/deploy/adapters/ansible/roles/ceph-deploy/tasks/ceph_install_Debian.yml
@@ -5,7 +5,7 @@
- create_ceph_cluster
- name: default config for ceph
- shell: cd {{ ceph_cluster_dir[0] }} && echo "osd_journal_size = 1024" >> ceph.conf && echo "osd_pool_default_size = 2" >> ceph.conf && echo "public_network = {{ public_cidr }}" >> ceph.conf && echo "cluster_network = {{ storage_cidr }} " >> ceph.conf
+ shell: cd {{ ceph_cluster_dir[0] }} && echo "osd_journal_size = 1024" >> ceph.conf && echo "osd_pool_default_size = 2" >> ceph.conf && echo "public_network = {{ mgmt_cidr }}" >> ceph.conf && echo "cluster_network = {{ storage_cidr }} " >> ceph.conf
- name: install ceph for every nodes includes jumpserver
shell: cd {{ ceph_cluster_dir[0] }} && ceph-deploy install {{ ceph_cluster_hosts.stdout_lines[0]}}
diff --git a/deploy/conf/network_cfg.yaml b/deploy/conf/network_cfg.yaml
index 7f274bd4..07d9016c 100644
--- a/deploy/conf/network_cfg.yaml
+++ b/deploy/conf/network_cfg.yaml
@@ -75,7 +75,7 @@ public_vip:
onos_nic: eth2
public_net_info:
- enable: True
+ enable: True
network: ext-net
type: flat
segment_id: 1000