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

diff --git a/os-nosdn-nofeature/.gitkeep b/os-nosdn-nofeature/.gitkeep
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/os-nosdn-nofeature/README.rst b/os-nosdn-nofeature/README.rst
new file mode 100644 (file)
index 0000000..dcdc83f
--- /dev/null
+++ b/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/os-nosdn-ovs/role/os-nosdn-ovs/files/ha/openstack_user_config.yml b/os-nosdn-nofeature/role/os-nosdn-nofeature/files/ha/openstack_user_config.yml
similarity index 100%
rename from os-nosdn-ovs/role/os-nosdn-ovs/files/ha/openstack_user_config.yml
rename to os-nosdn-nofeature/role/os-nosdn-nofeature/files/ha/openstack_user_config.yml

diff --git a/os-nosdn-ovs/role/os-nosdn-ovs/files/mini/openstack_user_config.yml b/os-nosdn-nofeature/role/os-nosdn-nofeature/files/mini/openstack_user_config.yml
similarity index 100%
rename from os-nosdn-ovs/role/os-nosdn-ovs/files/mini/openstack_user_config.yml
rename to os-nosdn-nofeature/role/os-nosdn-nofeature/files/mini/openstack_user_config.yml

diff --git a/os-nosdn-ovs/role/os-nosdn-ovs/files/noha/openstack_user_config.yml b/os-nosdn-nofeature/role/os-nosdn-nofeature/files/noha/openstack_user_config.yml
similarity index 100%
rename from os-nosdn-ovs/role/os-nosdn-ovs/files/noha/openstack_user_config.yml
rename to os-nosdn-nofeature/role/os-nosdn-nofeature/files/noha/openstack_user_config.yml

diff --git a/os-nosdn-ovs/role/os-nosdn-ovs/files/user_variables_os-nosdn-ovs.yml b/os-nosdn-nofeature/role/os-nosdn-nofeature/files/user_variables_os-nosdn-nofeature.yml
similarity index 100%
rename from os-nosdn-ovs/role/os-nosdn-ovs/files/user_variables_os-nosdn-ovs.yml
rename to os-nosdn-nofeature/role/os-nosdn-nofeature/files/user_variables_os-nosdn-nofeature.yml

diff --git a/os-nosdn-ovs/role/os-nosdn-ovs/tasks/main.yml b/os-nosdn-nofeature/role/os-nosdn-nofeature/tasks/main.yml
similarity index 70%
rename from os-nosdn-ovs/role/os-nosdn-ovs/tasks/main.yml
rename to os-nosdn-nofeature/role/os-nosdn-nofeature/tasks/main.yml
index c2c0d86..3725fb5 100644 (file)
--- a/os-nosdn-ovs/role/os-nosdn-ovs/tasks/main.yml
+++ b/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"