diff options
Diffstat (limited to 'deploy/adapters/ansible/roles/config-deployment')
| -rw-r--r-- | deploy/adapters/ansible/roles/config-deployment/files/setup-ovs.yml | 10 | ||||
| -rw-r--r-- | deploy/adapters/ansible/roles/config-deployment/tasks/main.yml | 14 | ||||
| -rw-r--r-- | deploy/adapters/ansible/roles/config-deployment/templates/user_variables.yml.j2 (renamed from deploy/adapters/ansible/roles/config-deployment/templates/user_variables.yml) | 2 |
3 files changed, 14 insertions, 12 deletions
diff --git a/deploy/adapters/ansible/roles/config-deployment/files/setup-ovs.yml b/deploy/adapters/ansible/roles/config-deployment/files/setup-ovs.yml index 10972401..57bc5ef1 100644 --- a/deploy/adapters/ansible/roles/config-deployment/files/setup-ovs.yml +++ b/deploy/adapters/ansible/roles/config-deployment/files/setup-ovs.yml @@ -10,13 +10,14 @@ name: neutron-openvswitch-agent state: stopped + # yamllint disable rule:line-length - name: change the openvswitch_agent.ini lineinfile: dest: /etc/neutron/plugins/ml2/openvswitch_agent.ini insertafter: '^bridge_mappings' line: "local_ip = {{ hostvars[inventory_hostname]['container_networks']['tunnel_address']['address'] }}" when: - - inventory_hostname not in groups['nova_compute'] + - inventory_hostname not in groups['nova_compute'] - name: change the openvswitch_agent.ini lineinfile: @@ -27,7 +28,8 @@ notify: - Restart neutron-openvswitch-agent when: - - inventory_hostname in groups['nova_compute'] + - inventory_hostname in groups['nova_compute'] + # yamllint enable rule:line-length - name: Setup br-provider openvswitch_bridge: @@ -36,7 +38,7 @@ notify: - Restart neutron-openvswitch-agent when: - - inventory_hostname not in groups['nova_compute'] + - inventory_hostname not in groups['nova_compute'] - name: Add port to br-provider openvswitch_port: @@ -46,7 +48,7 @@ notify: - Restart neutron-openvswitch-agent when: - - inventory_hostname not in groups['nova_compute'] + - inventory_hostname not in groups['nova_compute'] handlers: - name: Restart neutron-openvswitch-agent diff --git a/deploy/adapters/ansible/roles/config-deployment/tasks/main.yml b/deploy/adapters/ansible/roles/config-deployment/tasks/main.yml index 1269cd3f..8246d6e7 100644 --- a/deploy/adapters/ansible/roles/config-deployment/tasks/main.yml +++ b/deploy/adapters/ansible/roles/config-deployment/tasks/main.yml @@ -1,11 +1,11 @@ -############################################################################## +# ############################################################################# # Copyright (c) 2017 HUAWEI TECHNOLOGIES CO.,LTD and others. # # All rights reserved. This program and the accompanying materials # are made available under the terms of the Apache License, Version 2.0 # which accompanies this distribution, and is available at # http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## +# ############################################################################# --- - name: create osa log directory file: @@ -19,7 +19,7 @@ - name: copy user_variables template: - src: user_variables.yml + src: user_variables.yml.j2 dest: /etc/openstack_deploy/user_variables.yml - name: copy cinder.yml @@ -44,13 +44,13 @@ - name: generate create-network.yml template: - src: create-network.yml.j2 - dest: /opt/openstack-ansible/playbooks/create-network.yml + src: create-network.yml.j2 + dest: /opt/openstack-ansible/playbooks/create-network.yml - name: generate create-flavor.yml template: - src: create-flavor.yml.j2 - dest: /opt/openstack-ansible/playbooks/create-flavor.yml + src: create-flavor.yml.j2 + dest: /opt/openstack-ansible/playbooks/create-flavor.yml - name: copy http.yml copy: diff --git a/deploy/adapters/ansible/roles/config-deployment/templates/user_variables.yml b/deploy/adapters/ansible/roles/config-deployment/templates/user_variables.yml.j2 index 16f78ff8..443a3f5b 100644 --- a/deploy/adapters/ansible/roles/config-deployment/templates/user_variables.yml +++ b/deploy/adapters/ansible/roles/config-deployment/templates/user_variables.yml.j2 @@ -29,7 +29,7 @@ haproxy_keepalived_internal_interface: br-mgmt {% if "openvswitch" == NEUTRON_MECHANISM_DRIVERS[0] or "opendaylight" == NEUTRON_MECHANISM_DRIVERS[0] - %} +%} openstack_host_specific_kernel_modules: - name: "openvswitch" pattern: "CONFIG_OPENVSWITCH=" |