From 49bf3616a506e880d5ecd0c0251005fc9392f86b Mon Sep 17 00:00:00 2001 From: Fatih Degirmenci Date: Thu, 23 Nov 2017 18:16:49 +0100 Subject: [PATCH 1/1] 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 --- os-nosdn-nofeature/.gitkeep | 0 os-nosdn-nofeature/README.rst | 2 ++ .../os-nosdn-nofeature}/files/ha/openstack_user_config.yml | 0 .../os-nosdn-nofeature}/files/mini/openstack_user_config.yml | 0 .../os-nosdn-nofeature}/files/noha/openstack_user_config.yml | 0 .../files/user_variables_os-nosdn-nofeature.yml | 0 .../role/os-nosdn-nofeature}/tasks/main.yml | 10 +++++----- 7 files changed, 7 insertions(+), 5 deletions(-) delete mode 100644 os-nosdn-nofeature/.gitkeep create mode 100644 os-nosdn-nofeature/README.rst rename {os-nosdn-ovs/role/os-nosdn-ovs => os-nosdn-nofeature/role/os-nosdn-nofeature}/files/ha/openstack_user_config.yml (100%) rename {os-nosdn-ovs/role/os-nosdn-ovs => os-nosdn-nofeature/role/os-nosdn-nofeature}/files/mini/openstack_user_config.yml (100%) rename {os-nosdn-ovs/role/os-nosdn-ovs => os-nosdn-nofeature/role/os-nosdn-nofeature}/files/noha/openstack_user_config.yml (100%) rename os-nosdn-ovs/role/os-nosdn-ovs/files/user_variables_os-nosdn-ovs.yml => os-nosdn-nofeature/role/os-nosdn-nofeature/files/user_variables_os-nosdn-nofeature.yml (100%) rename {os-nosdn-ovs/role/os-nosdn-ovs => os-nosdn-nofeature/role/os-nosdn-nofeature}/tasks/main.yml (70%) diff --git a/os-nosdn-nofeature/.gitkeep b/os-nosdn-nofeature/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/os-nosdn-nofeature/README.rst b/os-nosdn-nofeature/README.rst new file mode 100644 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 --- 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" -- 2.16.6