diff options
| author |   baigk <baiguoku@huawei.com> | 2015-08-06 02:37:33 -0400 |
|---|---|---|
| committer | baigk <baiguoku@huawei.com> | 2015-08-09 22:47:56 -0400 |
| commit | 87612abc0e24cafd89a49e350165b08fe1608233 (patch) | |
| tree | 07b156c0268fd189f92e8a0730118edc51b8073f /deploy/adapters/ansible/roles/neutron-controller/tasks | |
| parent | 5aedf594112c0749b6e9039d15b9fe70d210a942 (diff) | |
support deployment openstack juno with ansible for compass in centos7.1
JIRA: COMPASS-6
Change-Id: I8ef865e8acfe29c3ff5c7e9030e4cebabed3457b
Signed-off-by: baigk <baiguoku@huawei.com>
Diffstat (limited to 'deploy/adapters/ansible/roles/neutron-controller/tasks')
| -rw-r--r-- | deploy/adapters/ansible/roles/neutron-controller/tasks/neutron_config.yml | 3 | ||||
| -rw-r--r-- | deploy/adapters/ansible/roles/neutron-controller/tasks/neutron_install.yml | 16 |
2 files changed, 8 insertions, 11 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 77cc29ae..c575b328 100644 --- a/deploy/adapters/ansible/roles/neutron-controller/tasks/neutron_config.yml +++ b/deploy/adapters/ansible/roles/neutron-controller/tasks/neutron_config.yml @@ -6,5 +6,6 @@ retries: 5 delay: 3 notify: - - restart neutron-server + - restart neutron control services +- meta: flush_handlers 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 08a8ce63..028419b5 100644 --- a/deploy/adapters/ansible/roles/neutron-controller/tasks/neutron_install.yml +++ b/deploy/adapters/ansible/roles/neutron-controller/tasks/neutron_install.yml @@ -2,12 +2,12 @@ - include_vars: "{{ ansible_os_family }}.yml" - name: install controller-related neutron packages - action: "{{ ansible_pkg_mgr }} name={{ item }} state=present force=yes" - with_items: packages + action: "{{ ansible_pkg_mgr }} name={{ item }} state=present" + with_items: packages | union(packages_noarch) -- name: generate neutron controll service list +- name: generate neutron control service list shell: echo {{ item }} >> /opt/service - with_items: services + with_items: services | union(services_noarch) - name: get tenant id to fill neutron.conf shell: keystone --os-token={{ ADMIN_TOKEN }} --os-endpoint=http://{{ HA_VIP }}:35357/v2.0 tenant-get service | grep id | awk '{print $4}' @@ -15,13 +15,9 @@ - name: update neutron conf template: src=neutron.conf dest=/etc/neutron/neutron.conf backup=yes - notify: - - restart neutron-server - name: update ml2 plugin conf template: src=ml2_conf.ini dest=/etc/neutron/plugins/ml2/ml2_conf.ini backup=yes - notify: - - restart neutron-server - -- meta: flush_handlers +- name: ln plugin.ini + file: src=/etc/neutron/plugins/ml2/ml2_conf.ini dest=/etc/neutron/plugin.ini state=link |