diff options
Diffstat (limited to 'scenarios/os-odl-sfc/role/os-odl-sfc/tasks')
| -rw-r--r-- | scenarios/os-odl-sfc/role/os-odl-sfc/tasks/add-sfc-repos-and-inventory-pike.yml | 16 | ||||
| -rw-r--r-- | scenarios/os-odl-sfc/role/os-odl-sfc/tasks/copy-OSA-config-files.yml (renamed from scenarios/os-odl-sfc/role/os-odl-sfc/tasks/copy-OSA-files-master.yml) | 4 | ||||
| -rw-r--r-- | scenarios/os-odl-sfc/role/os-odl-sfc/tasks/copy-OSA-files-pike.yml | 57 | ||||
| -rw-r--r-- | scenarios/os-odl-sfc/role/os-odl-sfc/tasks/main.yml | 13 | ||||
| -rw-r--r-- | scenarios/os-odl-sfc/role/os-odl-sfc/tasks/post-deployment.yml | 17 |
5 files changed, 21 insertions, 86 deletions
diff --git a/scenarios/os-odl-sfc/role/os-odl-sfc/tasks/add-sfc-repos-and-inventory-pike.yml b/scenarios/os-odl-sfc/role/os-odl-sfc/tasks/add-sfc-repos-and-inventory-pike.yml deleted file mode 100644 index 3c80fa5e..00000000 --- a/scenarios/os-odl-sfc/role/os-odl-sfc/tasks/add-sfc-repos-and-inventory-pike.yml +++ /dev/null @@ -1,16 +0,0 @@ ---- - -- name: Add networking-odl and networking-sfc repos - copy: - src: openstack-ansible/playbooks/defaults/repo_packages/opendaylight-pike.yml - dest: "{{openstack_osa_path}}/playbooks/defaults/repo_packages/opendaylight.yml" - -- name: Provide nova inventory which adds OVS-NSH hosts - copy: - src: openstack-ansible/playbooks/inventory_odl/env.d/nova.yml - dest: "{{openstack_osa_path}}/playbooks/inventory/env.d/nova.yml" - -- name: Provide neutron inventory which adds ODL hosts - copy: - src: openstack-ansible/playbooks/inventory_odl/env.d/neutron.yml - dest: "{{openstack_osa_path}}/playbooks/inventory/env.d/neutron.yml" diff --git a/scenarios/os-odl-sfc/role/os-odl-sfc/tasks/copy-OSA-files-master.yml b/scenarios/os-odl-sfc/role/os-odl-sfc/tasks/copy-OSA-config-files.yml index fbaa7301..5d677d1c 100644 --- a/scenarios/os-odl-sfc/role/os-odl-sfc/tasks/copy-OSA-files-master.yml +++ b/scenarios/os-odl-sfc/role/os-odl-sfc/tasks/copy-OSA-config-files.yml @@ -13,8 +13,8 @@ dest: "{{openstack_osa_etc_path}}/user_sfc_scenarios_variables.yml" when: ansible_pkg_mgr == 'apt' -# To get the mano_host variable (can only be defined here for the inventory) +# To get the mano_host & metering-infra_hosts variable for inventory - name: copy openstack_user_config.yml copy: - src: "tacker_files/{{xci_flavor}}/openstack_user_config.yml" + src: "{{xci_flavor}}/openstack_user_config.yml" dest: "{{openstack_osa_etc_path}}/openstack_user_config.yml" diff --git a/scenarios/os-odl-sfc/role/os-odl-sfc/tasks/copy-OSA-files-pike.yml b/scenarios/os-odl-sfc/role/os-odl-sfc/tasks/copy-OSA-files-pike.yml deleted file mode 100644 index a9d197da..00000000 --- a/scenarios/os-odl-sfc/role/os-odl-sfc/tasks/copy-OSA-files-pike.yml +++ /dev/null @@ -1,57 +0,0 @@ ---- -# - -- name: copy user_sfc_scenarios_variables.yml - copy: - src: "{{xci_flavor}}/user_sfc_scenarios_variables_pike.yml" - dest: "{{openstack_osa_etc_path}}/user_sfc_scenarios_variables.yml" - -- name: copy OPNFV role requirements - copy: - src: "ansible-role-requirements-pike.yml" - dest: "{{openstack_osa_path}}/ansible-role-requirements.yml" - -- name: copy openstack_user_config.yml - copy: - src: "tacker_files/{{xci_flavor}}/openstack_user_config.yml" - dest: "{{openstack_osa_etc_path}}/openstack_user_config.yml" - -- name: copy tacker inventory file - copy: - src: "tacker_files/tacker.yml" - dest: "{{openstack_osa_etc_path}}/env.d/tacker.yml" - -- name: copy user_secrets.yml for tacker - copy: - src: "tacker_files/user_secrets.yml" - dest: "{{openstack_osa_etc_path}}/user_secrets.yml" - -- name: copy haproxy_config.yml for tacker - copy: - src: "tacker_files/haproxy_config.yml" - dest: "{{openstack_osa_path}}/group_vars/all/haproxy_config.yml" - -- name: copy openstack_services.yml with tacker - copy: - src: "tacker_files/openstack_services_pike.yml" - dest: "{{openstack_osa_path}}/playbooks/defaults/repo_packages/openstack_services.yml" - -- name: copy all/tacker.yml - copy: - src: "tacker_files/all_tacker.yml" - dest: "{{openstack_osa_path}}/group_vars/all/tacker.yml" - -- name: copy tacker_all.yml - copy: - src: "tacker_files/tacker_all.yml" - dest: "{{openstack_osa_path}}/group_vars/tacker_all.yml" - -- name: copy setup-openstack.yml - copy: - src: "tacker_files/setup-openstack.yml" - dest: "{{openstack_osa_path}}/playbooks/setup-openstack.yml" - -- name: copy os-tacker-install.yml - copy: - src: "tacker_files/os-tacker-install.yml" - dest: "{{openstack_osa_path}}/playbooks/os-tacker-install.yml" diff --git a/scenarios/os-odl-sfc/role/os-odl-sfc/tasks/main.yml b/scenarios/os-odl-sfc/role/os-odl-sfc/tasks/main.yml index 628d8af8..f3b4e736 100644 --- a/scenarios/os-odl-sfc/role/os-odl-sfc/tasks/main.yml +++ b/scenarios/os-odl-sfc/role/os-odl-sfc/tasks/main.yml @@ -8,14 +8,5 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## -- name: Add SFC repos and inventory for Pike - include: add-sfc-repos-and-inventory-pike.yml - when: openstack_osa_version == "stable/pike" - -- name: Copy the OSA not-yet-upstreamed files for Pike - include: copy-OSA-files-pike.yml - when: openstack_osa_version == "stable/pike" - -- name: Copy the OSA not-yet-upstreamed files for master - include: copy-OSA-files-master.yml - when: openstack_osa_version != "stable/pike" +- name: Copy the OSA config files + include: copy-OSA-config-files.yml diff --git a/scenarios/os-odl-sfc/role/os-odl-sfc/tasks/post-deployment.yml b/scenarios/os-odl-sfc/role/os-odl-sfc/tasks/post-deployment.yml new file mode 100644 index 00000000..837a8ee3 --- /dev/null +++ b/scenarios/os-odl-sfc/role/os-odl-sfc/tasks/post-deployment.yml @@ -0,0 +1,17 @@ +# SPDX-license-identifier: Apache-2.0 +############################################################################## +# Copyright (c) 2018 SUSE Linux GmbH +# 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: "Fetch the ip of the neutron server container" + shell: 'grep controller00_neutron_server_container -n1 /etc/openstack_deploy/openstack_inventory.json | grep ansible_host | cut -d":" -f2 | cut -d "\"" -f2' + register: ip + change_when: False + +- name: Fetch the ml2_conf.ini to process ODL variables + command: "scp -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no {{ ip.stdout }}:/etc/neutron/plugins/ml2/ml2_conf.ini /tmp/ml2_conf.ini" + change_when: False |