aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/services
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-03-31 11:07:11 +0000
committerGerrit Code Review <review@openstack.org>2017-03-31 11:07:12 +0000
commit51813d8b3407cb31d8d2c501c4d8b60f0b06bfe9 (patch)
tree525c669790d64737bd1242fe5eb551af3cda5544 /puppet/services
parent495754e2cb739f15678227c4f6de1227f6a5e059 (diff)
parentc26c32519bfdd4eac09acf4763ae3ca12956cabd (diff)
Merge "[N->O] is creating 2 default cell_v2 cells" into stable/ocata
Diffstat (limited to 'puppet/services')
-rw-r--r--puppet/services/nova-api.yaml8
1 files changed, 4 insertions, 4 deletions
diff --git a/puppet/services/nova-api.yaml b/puppet/services/nova-api.yaml
index f27b53f2..d5520522 100644
--- a/puppet/services/nova-api.yaml
+++ b/puppet/services/nova-api.yaml
@@ -241,15 +241,15 @@ outputs:
command: nova-manage db sync
async: {get_param: NovaDbSyncTimeout}
poll: 10
- - name: Setup cell_v2 (migrate hosts)
- tags: step5
- when: is_bootstrap_node
- command: nova-manage cell_v2 map_cell_and_hosts
- name: Setup cell_v2 (get cell uuid)
tags: step5
when: is_bootstrap_node
shell: nova-manage cell_v2 list_cells | sed -e '1,3d' -e '$d' | awk -F ' *| *' '$2 == "default" {print $4}'
register: nova_api_cell_uuid
+ - name: Setup cell_v2 (migrate hosts)
+ tags: step5
+ when: is_bootstrap_node
+ command: nova-manage cell_v2 discover_hosts --cell_uuid {{nova_api_cell_uuid.stdout}} --verbose
- name: Setup cell_v2 (migrate instances)
tags: step5
when: is_bootstrap_node