aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorManuel Buil <mbuil@suse.com>2018-10-19 18:29:01 +0200
committerBrady Johnson <bjohnson@inocybe.com>2018-10-22 07:23:19 +0000
commit03334c4c2cdb42a469b174ffd8718189d5cc8907 (patch)
tree760b54c77d4cd1df8675a643d81dd43ffed8b2a9
parent9739f4cfe5ad98ad4811d98e9ae6452f0e55a0be (diff)
Cleanup our ansible role
Our role had some old comments and confusing names which don't make sense anymore. This patches cleans it up Change-Id: Ieb928aad2c1b0bfcfa94b300201e026e11a4c991 Signed-off-by: Manuel Buil <mbuil@suse.com>
-rw-r--r--scenarios/os-odl-sfc/role/os-odl-sfc/README11
-rw-r--r--scenarios/os-odl-sfc/role/os-odl-sfc/files/ha/openstack_user_config.yml (renamed from scenarios/os-odl-sfc/role/os-odl-sfc/files/tacker_files/ha/openstack_user_config.yml)0
-rw-r--r--scenarios/os-odl-sfc/role/os-odl-sfc/files/mini/openstack_user_config.yml (renamed from scenarios/os-odl-sfc/role/os-odl-sfc/files/tacker_files/mini/openstack_user_config.yml)0
-rw-r--r--scenarios/os-odl-sfc/role/os-odl-sfc/files/noha/openstack_user_config.yml (renamed from scenarios/os-odl-sfc/role/os-odl-sfc/files/tacker_files/noha/openstack_user_config.yml)0
-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/main.yml4
6 files changed, 4 insertions, 15 deletions
diff --git a/scenarios/os-odl-sfc/role/os-odl-sfc/README b/scenarios/os-odl-sfc/role/os-odl-sfc/README
deleted file mode 100644
index a7461ec..0000000
--- a/scenarios/os-odl-sfc/role/os-odl-sfc/README
+++ /dev/null
@@ -1,11 +0,0 @@
-This is the role which deploys the os-odl-sfc scenarios in xci.
-
-This role currently works with:
-
-- OpenStack stable/queens
-- ODL Oxygen
-- OVS+NSH patch
-- OpenSUSE 42.3 or Ubuntu 16.04
-
-Follow this link:
-https://wiki.opnfv.org/display/sfc/Deploy+OPNFV+SFC+scenarios
diff --git a/scenarios/os-odl-sfc/role/os-odl-sfc/files/tacker_files/ha/openstack_user_config.yml b/scenarios/os-odl-sfc/role/os-odl-sfc/files/ha/openstack_user_config.yml
index 838ea46..838ea46 100644
--- a/scenarios/os-odl-sfc/role/os-odl-sfc/files/tacker_files/ha/openstack_user_config.yml
+++ b/scenarios/os-odl-sfc/role/os-odl-sfc/files/ha/openstack_user_config.yml
diff --git a/scenarios/os-odl-sfc/role/os-odl-sfc/files/tacker_files/mini/openstack_user_config.yml b/scenarios/os-odl-sfc/role/os-odl-sfc/files/mini/openstack_user_config.yml
index 48ce06e..48ce06e 100644
--- a/scenarios/os-odl-sfc/role/os-odl-sfc/files/tacker_files/mini/openstack_user_config.yml
+++ b/scenarios/os-odl-sfc/role/os-odl-sfc/files/mini/openstack_user_config.yml
diff --git a/scenarios/os-odl-sfc/role/os-odl-sfc/files/tacker_files/noha/openstack_user_config.yml b/scenarios/os-odl-sfc/role/os-odl-sfc/files/noha/openstack_user_config.yml
index 5caed12..5caed12 100644
--- a/scenarios/os-odl-sfc/role/os-odl-sfc/files/tacker_files/noha/openstack_user_config.yml
+++ b/scenarios/os-odl-sfc/role/os-odl-sfc/files/noha/openstack_user_config.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 fbaa730..5d677d1 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/main.yml b/scenarios/os-odl-sfc/role/os-odl-sfc/tasks/main.yml
index 270f601..f3b4e73 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,5 +8,5 @@
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
-- name: Copy the OSA not-yet-upstreamed files for master
- include: copy-OSA-files-master.yml
+- name: Copy the OSA config files
+ include: copy-OSA-config-files.yml