aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFatih Degirmenci <fdegir@gmail.com>2018-03-23 23:20:45 -0700
committerFatih Degirmenci <fdegir@gmail.com>2018-03-23 23:20:45 -0700
commit9dda531e8e9be93b930b89d45a395085fbcb61cc (patch)
tree612923eda4ddbaf40eace04afbd03aeb31fc1955
parent752428421637d40833ff68647cdbbe58809a643f (diff)
xci: Lowercase ansible variables
Change-Id: I35960abdab146ab2f80a1ad160489ee4877d42e4 Signed-off-by: Fatih Degirmenci <fdegir@gmail.com>
-rw-r--r--scenarios/os-odl-sfc/role/os-odl-sfc/tasks/add-sfc-repos-and-inventory-pike.yml6
-rw-r--r--scenarios/os-odl-sfc/role/os-odl-sfc/tasks/copy-OSA-files-master.yml12
-rw-r--r--scenarios/os-odl-sfc/role/os-odl-sfc/tasks/copy-OSA-files-pike.yml26
-rw-r--r--scenarios/os-odl-sfc/role/os-odl-sfc/tasks/main.yml6
4 files changed, 25 insertions, 25 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
index 3396b83..3c80fa5 100644
--- 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
@@ -3,14 +3,14 @@
- 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"
+ 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"
+ 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"
+ 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-files-master.yml
index 80e3ac0..5ffebee 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-files-master.yml
@@ -3,18 +3,18 @@
- name: copy user_sfc_scenarios_variables.yml (SUSE)
copy:
- src: "{{XCI_FLAVOR}}/user_sfc_scenarios_variables_suse.yml"
- dest: "{{OPENSTACK_OSA_ETC_PATH}}/user_sfc_scenarios_variables.yml"
+ src: "{{xci_flavor}}/user_sfc_scenarios_variables_suse.yml"
+ dest: "{{openstack_osa_etc_path}}/user_sfc_scenarios_variables.yml"
when: ansible_pkg_mgr == 'zypper'
- name: copy user_sfc_scenarios_variables.yml (Ubuntu)
copy:
- src: "{{XCI_FLAVOR}}/user_sfc_scenarios_variables_ubuntu.yml"
- dest: "{{OPENSTACK_OSA_ETC_PATH}}/user_sfc_scenarios_variables.yml"
+ src: "{{xci_flavor}}/user_sfc_scenarios_variables_ubuntu.yml"
+ 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)
- 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"
+ src: "tacker_files/{{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
index 5459dfe..a9d197d 100644
--- 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
@@ -3,55 +3,55 @@
- 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"
+ 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"
+ 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"
+ 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"
+ 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"
+ 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"
+ 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"
+ 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"
+ 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"
+ 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"
+ 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"
+ 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 f2c98e4..628d8af 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
@@ -10,12 +10,12 @@
- name: Add SFC repos and inventory for Pike
include: add-sfc-repos-and-inventory-pike.yml
- when: OPENSTACK_OSA_VERSION == "stable/pike"
+ 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"
+ 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"
+ when: openstack_osa_version != "stable/pike"