diff options
3 files changed, 15 insertions, 15 deletions
diff --git a/scenarios/os-odl-bgpvpn/role/os-odl-bgpvpn/tasks/add-inventory-files-pike.yml b/scenarios/os-odl-bgpvpn/role/os-odl-bgpvpn/tasks/add-inventory-files-pike.yml index 36dd7eb..11ca33d 100644 --- a/scenarios/os-odl-bgpvpn/role/os-odl-bgpvpn/tasks/add-inventory-files-pike.yml +++ b/scenarios/os-odl-bgpvpn/role/os-odl-bgpvpn/tasks/add-inventory-files-pike.yml @@ -3,14 +3,14 @@ - name: Add networking-odl and networking-bgpvpn repos copy: src: openstack-ansible/pike/playbooks/defaults/repo_packages/opendaylight.yml - dest: "{{OPENSTACK_OSA_PATH}}/playbooks/defaults/repo_packages/opendaylight.yml" + dest: "{{openstack_osa_path}}/playbooks/defaults/repo_packages/opendaylight.yml" - name: Provide neutron inventory which adds quagga into neutron server copy: src: openstack-ansible/pike/playbooks/inventory/env.d/neutron.yml - dest: "{{OPENSTACK_OSA_PATH}}/playbooks/inventory/env.d/neutron.yml" + dest: "{{openstack_osa_path}}/playbooks/inventory/env.d/neutron.yml" - name: Provide Quagga inventory which adds quagga hosts copy: src: openstack-ansible/pike/playbooks/inventory/env.d/quagga.yml - dest: "{{OPENSTACK_OSA_PATH}}/playbooks/inventory/env.d/quagga.yml" + dest: "{{openstack_osa_path}}/playbooks/inventory/env.d/quagga.yml" diff --git a/scenarios/os-odl-bgpvpn/role/os-odl-bgpvpn/tasks/add-osa-files-pike.yml b/scenarios/os-odl-bgpvpn/role/os-odl-bgpvpn/tasks/add-osa-files-pike.yml index 58b74fd..46c3700 100644 --- a/scenarios/os-odl-bgpvpn/role/os-odl-bgpvpn/tasks/add-osa-files-pike.yml +++ b/scenarios/os-odl-bgpvpn/role/os-odl-bgpvpn/tasks/add-osa-files-pike.yml @@ -3,14 +3,14 @@ - name: copy quagga variable file copy: src: openstack-ansible/pike/group-vars/quagga_all.yml - dest: "{{OPENSTACK_OSA_PATH}}/group-vars/quagga_all.yml" + dest: "{{openstack_osa_path}}/group-vars/quagga_all.yml" - name: Add the Quagga configuration playbook copy: src: openstack-ansible/pike/playbooks/os-setup-bgp-odl.yml - dest: "{{OPENSTACK_OSA_PATH}}/playbooks/os-setup-bgp-odl.yml" + dest: "{{openstack_osa_path}}/playbooks/os-setup-bgp-odl.yml" - name: copy OPNFV role requirements copy: src: "ansible-role-requirements-pike.yml" - dest: "{{OPENSTACK_OSA_PATH}}/ansible-role-requirements.yml"
\ No newline at end of file + dest: "{{openstack_osa_path}}/ansible-role-requirements.yml" diff --git a/scenarios/os-odl-bgpvpn/role/os-odl-bgpvpn/tasks/main.yml b/scenarios/os-odl-bgpvpn/role/os-odl-bgpvpn/tasks/main.yml index 1e43434..76ee389 100644 --- a/scenarios/os-odl-bgpvpn/role/os-odl-bgpvpn/tasks/main.yml +++ b/scenarios/os-odl-bgpvpn/role/os-odl-bgpvpn/tasks/main.yml @@ -11,29 +11,29 @@ - name: copy user_variables_os-odl-bgpvpn.yml copy: src: "user_variables_os-odl-bgpvpn.yml" - dest: "{{OPENSTACK_OSA_ETC_PATH}}/user_variables_os-odl-bgpvpn.yml" + dest: "{{openstack_osa_etc_path}}/user_variables_os-odl-bgpvpn.yml" - name: copy user_variables_os-odl-bgpvpn-ha.yml copy: - src: "{{XCI_FLAVOR}}/user_variables_os-odl-bgpvpn-ha.yml" - dest: "{{OPENSTACK_OSA_ETC_PATH}}/user_variables_os-odl-bgpvpn-ha.yml" + src: "{{xci_flavor}}/user_variables_os-odl-bgpvpn-ha.yml" + dest: "{{openstack_osa_etc_path}}/user_variables_os-odl-bgpvpn-ha.yml" when: - - XCI_FLAVOR == "ha" + - xci_flavor == "ha" - name: copy os-odl-bgpvpn scenario specific openstack_user_config.yml copy: - src: "{{XCI_FLAVOR}}/openstack_user_config.yml" - dest: "{{OPENSTACK_OSA_ETC_PATH}}/openstack_user_config.yml" + src: "{{xci_flavor}}/openstack_user_config.yml" + dest: "{{openstack_osa_etc_path}}/openstack_user_config.yml" - name: copy os-odl-bgpvpn scenario specific setup-openstack.yml copy: src: "setup-openstack.yml" - dest: "{{OPENSTACK_OSA_PATH}}/playbooks" + dest: "{{openstack_osa_path}}/playbooks" - name: Copy the OSA not-yet-upstreamed files for Pike include: add-osa-files-pike.yml - when: OPENSTACK_OSA_VERSION == "stable/pike" + when: openstack_osa_version == "stable/pike" - name: Copy the OSA not-yet-upstreamed inventory files for Pike include: add-inventory-files-pike.yml - when: OPENSTACK_OSA_VERSION == "stable/pike" + when: openstack_osa_version == "stable/pike" |