Move contents of os-nosdn-ovs into os-nosdn-nofeature

This change fixes the scenario os-nosdn-nofeature by
moving directories/files from os-nosdn-ovs to os-nosdn-nofeature.
The contents of the files and variables are also either adjusted
or removed in order to prevent impacts on CI.

Change-Id: Icfde27f413c8f93d097f9f262c8cb1230b7fe59d
Signed-off-by: Fatih Degirmenci <fdegir@gmail.com>

11 files changed, 41 insertions, 20 deletions

diff --git a/xci/config/env-vars b/xci/config/env-vars
index 67ce443e..1068a138 100755
--- a/xci/config/env-vars
+++ b/xci/config/env-vars
@@ -31,4 +31,3 @@ export XCI_ANSIBLE_PIP_VERSION=2.3.2.0
 export ANSIBLE_HOST_KEY_CHECKING=False
 # subject of the certificate
 export XCI_SSL_SUBJECT=${XCI_SSL_SUBJECT:-"/C=US/ST=California/L=San Francisco/O=IT/CN=xci.releng.opnfv.org"}
-export OPNFV_SCENARIO=${OPNFV_SCENARIO:-"os-nosdn-nofeature"}
diff --git a/xci/opnfv-scenario-requirements.yml b/xci/opnfv-scenario-requirements.yml
index 664b020a..8192fe29 100644
--- a/xci/opnfv-scenario-requirements.yml
+++ b/xci/opnfv-scenario-requirements.yml
@@ -16,11 +16,11 @@
   src: https://gerrit.opnfv.org/gerrit/sfc
   version: master
   role: scenarios/os-odl-sfc/role/os-odl-sfc
-- scenario: os-nosdn-ovs
+- scenario: os-nosdn-nofeature
   scm: git
   src: https://git.opnfv.org/releng-xci
   version: master
-  role: xci/scenarios/os-nosdn-ovs/role/os-nosdn-ovs
+  role: xci/scenarios/os-nosdn-nofeature/role/os-nosdn-nofeature
 - scenario: os-odl-nofeature
   scm: git
   src: https://git.opnfv.org/releng-xci
diff --git a/xci/playbooks/bootstrap-scenarios.yml b/xci/playbooks/bootstrap-scenarios.yml
index d7b43dd6..55882804 100644
--- a/xci/playbooks/bootstrap-scenarios.yml
+++ b/xci/playbooks/bootstrap-scenarios.yml
@@ -9,10 +9,10 @@
 #     name: "foobar"
 #   when: OPNFV_SCENARIO == "foobar"
 
-- name: Prepare everything to run the os-nosdn-ovs scenario
+- name: Prepare everything to run the os-nosdn-nofeature scenario
   include_role:
-    name: "os-nosdn-ovs"
-  when: OPNFV_SCENARIO == 'os-nosdn-ovs'
+    name: "os-nosdn-nofeature"
+  when: OPNFV_SCENARIO == 'os-nosdn-nofeature'
 - name: Prepare everything to run the os-odl-nofeature scenario
   include_role:
     name: "os-odl-nofeature"
diff --git a/xci/playbooks/get-opnfv-scenario-requirements.yml b/xci/playbooks/get-opnfv-scenario-requirements.yml
index c59c18f1..fbe60f67 100644
--- a/xci/playbooks/get-opnfv-scenario-requirements.yml
+++ b/xci/playbooks/get-opnfv-scenario-requirements.yml
@@ -21,18 +21,24 @@
   vars_files:
     - ../var/opnfv.yml
   tasks:
-    - name: Remove target directory
+    - name: Remove existing scenario directories
       file:
-        path: "{{ item.path | default(scenario_path_default) + '/' + item.scenario }}"
+        path: "{{ item[1] }} + '/' + {{ item[0].scenario }}"
         state: absent
-      when:
-        - item.scm == "git" or item.scm is undefined
+      with_nested:
+        - "{{ scenarios }}"
+        - [ "{{ scenario_path_default }}", "{{ role_path_default }}" ]
+
+    - name: Create scenario directories
+      file:
+        path: "{{ role_path_default }} + '/' + item.scenario }}"
+        state: directory
       with_items: "{{ scenarios }}"
 
     - name: Clone git repos (with git)
       git:
         repo: "{{ item.src }}"
-        dest: "{{ item.path | default(scenario_path_default) }}/{{ item.scenario | default(item.src | basename) }}"
+        dest: "{{ scenario_path_default }}/{{ item.scenario | default(item.src | basename) }}"
         version: "{{ item.version | default('master') }}"
         refspec: "{{ item.refspec | default(omit) }}"
         update: true
@@ -45,12 +51,26 @@
       retries: "{{ git_clone_retries }}"
       delay: "{{ git_clone_retry_delay }}"
 
-    - name: Plug in the roles to XCI
-      shell: >-
-          cp -a {{ item.path | default(scenario_path_default) }}/{{ item.scenario | default(item.src | basename) }}/{{ item.role }}
-          {{ role_path_default }}/{{ item.scenario }}
+    - name: Check that scenarios exist
+      stat:
+        path: "{{ scenario_path_default }}/{{ item.scenario }}/{{ item.role }}"
+      register: scenarios_list_exists
       with_items: "{{ scenarios }}"
 
+    - name: Plug in the scenario to XCI
+      shell: >-
+          cp -a {{ scenario_path_default }}/{{ item.item.scenario }}/{{ item.item.role }}
+          {{ role_path_default }}/{{ item.item.scenario }}
+      when: item.stat.exists
+      with_items: "{{ scenarios_list_exists.results }}"
+
+    - name: Plug in the scenario to XCI (fallback)
+      shell: >-
+          cp -a {{ XCI_PATH }}/{{ item.item.role }}
+          {{ role_path_default }}/{{ item.item.scenario }}
+      when: not item.stat.exists
+      with_items: "{{ scenarios_list_exists.results }}"
+
   vars:
     ansible_python_interpreter: "/usr/bin/python"
     scenarios: "{{ lookup('file', scenario_file) | from_yaml }}"
diff --git a/xci/scenarios/os-nosdn-nofeature/.gitkeep b/xci/scenarios/os-nosdn-nofeature/.gitkeep
deleted file mode 100644
index e69de29b..00000000
--- a/xci/scenarios/os-nosdn-nofeature/.gitkeep
+++ /dev/null
diff --git a/xci/scenarios/os-nosdn-nofeature/README.rst b/xci/scenarios/os-nosdn-nofeature/README.rst
new file mode 100644
index 00000000..dcdc83fc
--- /dev/null
+++ b/xci/scenarios/os-nosdn-nofeature/README.rst
@@ -0,0 +1,2 @@
+This scenario is currently incomplete. In order for it to be
+complete, changes for CEPH must be moved here, combining OVS + CEPH.
diff --git a/xci/scenarios/os-nosdn-ovs/role/os-nosdn-ovs/files/ha/openstack_user_config.yml b/xci/scenarios/os-nosdn-nofeature/role/os-nosdn-nofeature/files/ha/openstack_user_config.yml
index 1aaf84d8..1aaf84d8 100644
--- a/xci/scenarios/os-nosdn-ovs/role/os-nosdn-ovs/files/ha/openstack_user_config.yml
+++ b/xci/scenarios/os-nosdn-nofeature/role/os-nosdn-nofeature/files/ha/openstack_user_config.yml
diff --git a/xci/scenarios/os-nosdn-ovs/role/os-nosdn-ovs/files/mini/openstack_user_config.yml b/xci/scenarios/os-nosdn-nofeature/role/os-nosdn-nofeature/files/mini/openstack_user_config.yml
index 86b87c15..86b87c15 100644
--- a/xci/scenarios/os-nosdn-ovs/role/os-nosdn-ovs/files/mini/openstack_user_config.yml
+++ b/xci/scenarios/os-nosdn-nofeature/role/os-nosdn-nofeature/files/mini/openstack_user_config.yml
diff --git a/xci/scenarios/os-nosdn-ovs/role/os-nosdn-ovs/files/noha/openstack_user_config.yml b/xci/scenarios/os-nosdn-nofeature/role/os-nosdn-nofeature/files/noha/openstack_user_config.yml
index 99b768c4..99b768c4 100644
--- a/xci/scenarios/os-nosdn-ovs/role/os-nosdn-ovs/files/noha/openstack_user_config.yml
+++ b/xci/scenarios/os-nosdn-nofeature/role/os-nosdn-nofeature/files/noha/openstack_user_config.yml
diff --git a/xci/scenarios/os-nosdn-ovs/role/os-nosdn-ovs/files/user_variables_os-nosdn-ovs.yml b/xci/scenarios/os-nosdn-nofeature/role/os-nosdn-nofeature/files/user_variables_os-nosdn-nofeature.yml
index 2f678544..2f678544 100644
--- a/xci/scenarios/os-nosdn-ovs/role/os-nosdn-ovs/files/user_variables_os-nosdn-ovs.yml
+++ b/xci/scenarios/os-nosdn-nofeature/role/os-nosdn-nofeature/files/user_variables_os-nosdn-nofeature.yml
diff --git a/xci/scenarios/os-nosdn-ovs/role/os-nosdn-ovs/tasks/main.yml b/xci/scenarios/os-nosdn-nofeature/role/os-nosdn-nofeature/tasks/main.yml
index c2c0d86f..3725fb58 100644
--- a/xci/scenarios/os-nosdn-ovs/role/os-nosdn-ovs/tasks/main.yml
+++ b/xci/scenarios/os-nosdn-nofeature/role/os-nosdn-nofeature/tasks/main.yml
@@ -8,11 +8,11 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 
-- name: copy user_variables_os-nosdn-ovs.yml
+- name: copy user_variables_os-nosdn-nofeature.yml
   copy:
-    src: "user_variables_os-nosdn-ovs.yml"
-    dest: "{{OPENSTACK_OSA_ETC_PATH}}/user_variables_os-nosdn-ovs.yml"
-- name: copy os-nosdn-ovs scenario specific openstack_user_config.yml
+    src: "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"
\ No newline at end of file
+    dest: "{{OPENSTACK_OSA_ETC_PATH}}/openstack_user_config.yml"