diff options
| author |   Fatih Degirmenci <fdegir@gmail.com> | 2018-03-20 20:16:56 +0100 |
|---|---|---|
| committer | Fatih Degirmenci <fdegir@gmail.com> | 2018-03-21 10:54:58 +0100 |
| commit | 8e93d6e6ce7612a93595adf2f061a04f2111e9e9 (patch) | |
| tree | 7a4daa622cdcbeaf7d3e2ec60a92b093353e0bd4 | |
| parent | 56b5642d5c3330c9e72f223647310d5680c97e5f (diff) | |
Clean up opnfv ansible vars and switch to lowercase
This change removes the variables that are not used in any of the
playbooks/roles from opnfv ansible vars.
Apart from that, all caps ansible vars replaced with lowercase ones
and impacted playbooks/roles are updated.
installer-type:osa
deploy-scenario:os-nosdn-nofeature
Change-Id: I99ebdc155b3903176ac5940b64cef0c0f3aa0f0d
Signed-off-by: Fatih Degirmenci <fdegir@gmail.com>
| -rw-r--r-- | os-nosdn-nofeature/role/os-nosdn-nofeature/tasks/main.yml | 6 | ||||
| -rw-r--r-- | os-odl-nofeature/role/os-odl-nofeature/tasks/main.yml | 12 |
2 files changed, 9 insertions, 9 deletions
diff --git a/os-nosdn-nofeature/role/os-nosdn-nofeature/tasks/main.yml b/os-nosdn-nofeature/role/os-nosdn-nofeature/tasks/main.yml index 3725fb5..79aa3aa 100644 --- a/os-nosdn-nofeature/role/os-nosdn-nofeature/tasks/main.yml +++ b/os-nosdn-nofeature/role/os-nosdn-nofeature/tasks/main.yml @@ -11,8 +11,8 @@ - name: copy user_variables_os-nosdn-nofeature.yml copy: src: "user_variables_os-nosdn-nofeature.yml" - dest: "{{OPENSTACK_OSA_ETC_PATH}}/user_variables_os-nosdn-nofeature.yml" + dest: "{{openstack_osa_etc_path}}/user_variables_os-nosdn-nofeature.yml" - name: copy os-nosdn-nofeature 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" diff --git a/os-odl-nofeature/role/os-odl-nofeature/tasks/main.yml b/os-odl-nofeature/role/os-odl-nofeature/tasks/main.yml index 61d31a7..cd016f5 100644 --- a/os-odl-nofeature/role/os-odl-nofeature/tasks/main.yml +++ b/os-odl-nofeature/role/os-odl-nofeature/tasks/main.yml @@ -11,16 +11,16 @@ - name: copy user_variables_os-odl-nofeature.yml copy: src: "user_variables_os-odl-nofeature.yml" - dest: "{{OPENSTACK_OSA_ETC_PATH}}/user_variables_os-odl-nofeature.yml" + dest: "{{openstack_osa_etc_path}}/user_variables_os-odl-nofeature.yml" - name: copy user_variables_os-odl-nofeature-ha.yml copy: - src: "{{XCI_FLAVOR}}/user_variables_os-odl-nofeature-ha.yml" - dest: "{{OPENSTACK_OSA_ETC_PATH}}/user_variables_os-odl-nofeature-ha.yml" + src: "{{xci_flavor}}/user_variables_os-odl-nofeature-ha.yml" + dest: "{{openstack_osa_etc_path}}/user_variables_os-odl-nofeature-ha.yml" when: - - XCI_FLAVOR == "ha" + - xci_flavor == "ha" - name: copy os-odl-nofeature scenario specific openstack_user_config.yml copy: - src: "{{XCI_FLAVOR}}/openstack_user_config.yml" - dest: "{{OPENSTACK_OSA_ETC_PATH}}/openstack_user_config.yml"
\ No newline at end of file + src: "{{xci_flavor}}/openstack_user_config.yml" + dest: "{{openstack_osa_etc_path}}/openstack_user_config.yml" |