diff options
| author |   liyuenan <liyuenan@huawei.com> | 2016-12-27 17:44:34 +0800 |
|---|---|---|
| committer | liyuenan <liyuenan@huawei.com> | 2017-01-05 09:42:35 +0800 |
| commit | 92f6ca7bb6d7b2f295406aab34094b1dba76ff94 (patch) | |
| tree | c4e62927a3bf9862f7ba9ce286cbece2c4335ef4 /deploy/adapters/ansible/roles/neutron-controller | |
| parent | 6072a49adb33f2bce3f48b9c7b8be7d96cf8501c (diff) | |
Yamllint test
JIRA: COMPASS-516
Change-Id: I482ce9bc86f4f963258c5b8823e0b00e83556eef
Signed-off-by: liyuenan <liyuenan@huawei.com>
Diffstat (limited to 'deploy/adapters/ansible/roles/neutron-controller')
3 files changed, 12 insertions, 5 deletions
diff --git a/deploy/adapters/ansible/roles/neutron-controller/tasks/neutron_config.yml b/deploy/adapters/ansible/roles/neutron-controller/tasks/neutron_config.yml index 47345f7a..6953a17b 100644 --- a/deploy/adapters/ansible/roles/neutron-controller/tasks/neutron_config.yml +++ b/deploy/adapters/ansible/roles/neutron-controller/tasks/neutron_config.yml @@ -9,9 +9,11 @@ --- - name: neutron-db-manage upgrade - shell: neutron-db-manage --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/plugins/ml2/ml2_conf.ini upgrade head + shell: | + neutron-db-manage --config-file=/etc/neutron/neutron.conf \ + --config-file=/etc/neutron/plugins/ml2/ml2_conf.ini upgrade head register: result - run_once: True + run_once: "True" until: result.rc == 0 retries: 10 delay: 5 diff --git a/deploy/adapters/ansible/roles/neutron-controller/tasks/neutron_install.yml b/deploy/adapters/ansible/roles/neutron-controller/tasks/neutron_install.yml index cc222224..63a80fa4 100644 --- a/deploy/adapters/ansible/roles/neutron-controller/tasks/neutron_install.yml +++ b/deploy/adapters/ansible/roles/neutron-controller/tasks/neutron_install.yml @@ -40,7 +40,13 @@ template: src=templates/neutron.conf dest=/etc/neutron/neutron.conf backup=yes - name: update ml2 plugin conf - template: src=templates/ml2_conf.ini dest=/etc/neutron/plugins/ml2/ml2_conf.ini backup=yes + template: + src: templates/ml2_conf.ini + dest: /etc/neutron/plugins/ml2/ml2_conf.ini + backup: "yes" - name: ln plugin.ini - file: src=/etc/neutron/plugins/ml2/ml2_conf.ini dest=/etc/neutron/plugin.ini state=link + file: + src: /etc/neutron/plugins/ml2/ml2_conf.ini + dest: /etc/neutron/plugin.ini + state: link diff --git a/deploy/adapters/ansible/roles/neutron-controller/vars/main.yml b/deploy/adapters/ansible/roles/neutron-controller/vars/main.yml index 928b0bda..aae4fe3c 100644 --- a/deploy/adapters/ansible/roles/neutron-controller/vars/main.yml +++ b/deploy/adapters/ansible/roles/neutron-controller/vars/main.yml @@ -11,4 +11,3 @@ packages_noarch: [] services_noarch: - neutron-server - |