xci: Connect releng-xci-scenarios repository

The releng-xci scenarions have been moved to their own repository so we
delete the copies from the releng-xci repository and also update the
opnfv-scenario-requirements to point to the new repository.

deploy-scenario:os-nosdn-nofeature
installer-type:osa

Change-Id: I1b7b3182a5e0c5b346c00b5734fd0cd3fdd5c98b
Signed-off-by: Markos Chandras <mchandras@suse.de>

6 files changed, 0 insertions, 652 deletions

diff --git a/xci/scenarios/os-nosdn-nofeature/README.rst b/xci/scenarios/os-nosdn-nofeature/README.rst
deleted file mode 100644
index dcdc83fc..00000000
--- a/xci/scenarios/os-nosdn-nofeature/README.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-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-nofeature/role/os-nosdn-nofeature/files/ha/openstack_user_config.yml b/xci/scenarios/os-nosdn-nofeature/role/os-nosdn-nofeature/files/ha/openstack_user_config.yml
deleted file mode 100644
index 1aaf84d8..00000000
--- a/xci/scenarios/os-nosdn-nofeature/role/os-nosdn-nofeature/files/ha/openstack_user_config.yml
+++ /dev/null
@@ -1,255 +0,0 @@
----
-cidr_networks:
-  container: 172.29.236.0/22
-  tunnel: 172.29.240.0/22
-  storage: 172.29.244.0/22
-
-used_ips:
-  - "172.29.236.1,172.29.236.50"
-  - "172.29.240.1,172.29.240.50"
-  - "172.29.244.1,172.29.244.50"
-  - "172.29.248.1,172.29.248.50"
-  - "172.29.236.222"
-
-global_overrides:
-  internal_lb_vip_address: 172.29.236.222
-  external_lb_vip_address: 192.168.122.220
-  tunnel_bridge: "br-vxlan"
-  management_bridge: "br-mgmt"
-  provider_networks:
-    - network:
-        container_bridge: "br-mgmt"
-        container_type: "veth"
-        container_interface: "eth1"
-        ip_from_q: "container"
-        type: "raw"
-        group_binds:
-          - all_containers
-          - hosts
-        is_container_address: true
-        is_ssh_address: true
-    - network:
-        container_bridge: "br-vxlan"
-        container_type: "veth"
-        container_interface: "eth10"
-        ip_from_q: "tunnel"
-        type: "vxlan"
-        range: "1:1000"
-        net_name: "vxlan"
-        group_binds:
-          - neutron_openvswitch_agent
-    - network:
-        container_bridge: "br-vlan"
-        container_type: "veth"
-        container_interface: "eth12"
-        host_bind_override: "eth12"
-        type: "flat"
-        net_name: "flat"
-        group_binds:
-          - neutron_openvswitch_agent
-    - network:
-        container_bridge: "br-vlan"
-        container_type: "veth"
-        container_interface: "eth11"
-        type: "vlan"
-        range: "1:1"
-        net_name: "vlan"
-        group_binds:
-          - neutron_openvswitch_agent
-    - network:
-        container_bridge: "br-storage"
-        container_type: "veth"
-        container_interface: "eth2"
-        ip_from_q: "storage"
-        type: "raw"
-        group_binds:
-          - glance_api
-          - cinder_api
-          - cinder_volume
-          - nova_compute
-
-# ##
-# ## Infrastructure
-# ##
-
-# galera, memcache, rabbitmq, utility
-shared-infra_hosts:
-  controller00:
-    ip: 172.29.236.11
-  controller01:
-    ip: 172.29.236.12
-  controller02:
-    ip: 172.29.236.13
-
-# repository (apt cache, python packages, etc)
-repo-infra_hosts:
-  controller00:
-    ip: 172.29.236.11
-  controller01:
-    ip: 172.29.236.12
-  controller02:
-    ip: 172.29.236.13
-
-# load balancer
-# Ideally the load balancer should not use the Infrastructure hosts.
-# Dedicated hardware is best for improved performance and security.
-haproxy_hosts:
-  controller00:
-    ip: 172.29.236.11
-  controller01:
-    ip: 172.29.236.12
-  controller02:
-    ip: 172.29.236.13
-
-# rsyslog server
-# log_hosts:
-# log1:
-#  ip: 172.29.236.14
-
-# ##
-# ## OpenStack
-# ##
-
-# keystone
-identity_hosts:
-  controller00:
-    ip: 172.29.236.11
-  controller01:
-    ip: 172.29.236.12
-  controller02:
-    ip: 172.29.236.13
-
-# cinder api services
-storage-infra_hosts:
-  controller00:
-    ip: 172.29.236.11
-  controller01:
-    ip: 172.29.236.12
-  controller02:
-    ip: 172.29.236.13
-
-# glance
-# The settings here are repeated for each infra host.
-# They could instead be applied as global settings in
-# user_variables, but are left here to illustrate that
-# each container could have different storage targets.
-image_hosts:
-  controller00:
-    ip: 172.29.236.11
-    container_vars:
-      limit_container_types: glance
-      glance_nfs_client:
-        - server: "172.29.244.14"
-          remote_path: "/images"
-          local_path: "/var/lib/glance/images"
-          type: "nfs"
-          options: "_netdev,auto"
-  controller01:
-    ip: 172.29.236.12
-    container_vars:
-      limit_container_types: glance
-      glance_nfs_client:
-        - server: "172.29.244.14"
-          remote_path: "/images"
-          local_path: "/var/lib/glance/images"
-          type: "nfs"
-          options: "_netdev,auto"
-  controller02:
-    ip: 172.29.236.13
-    container_vars:
-      limit_container_types: glance
-      glance_nfs_client:
-        - server: "172.29.244.14"
-          remote_path: "/images"
-          local_path: "/var/lib/glance/images"
-          type: "nfs"
-          options: "_netdev,auto"
-
-# nova api, conductor, etc services
-compute-infra_hosts:
-  controller00:
-    ip: 172.29.236.11
-  controller01:
-    ip: 172.29.236.12
-  controller02:
-    ip: 172.29.236.13
-
-# heat
-orchestration_hosts:
-  controller00:
-    ip: 172.29.236.11
-  controller01:
-    ip: 172.29.236.12
-  controller02:
-    ip: 172.29.236.13
-
-# horizon
-dashboard_hosts:
-  controller00:
-    ip: 172.29.236.11
-  controller01:
-    ip: 172.29.236.12
-  controller02:
-    ip: 172.29.236.13
-
-# neutron server, agents (L3, etc)
-network_hosts:
-  controller00:
-    ip: 172.29.236.11
-  controller01:
-    ip: 172.29.236.12
-  controller02:
-    ip: 172.29.236.13
-
-# nova hypervisors
-compute_hosts:
-  compute00:
-    ip: 172.29.236.14
-  compute01:
-    ip: 172.29.236.15
-
-# cinder volume hosts (NFS-backed)
-# The settings here are repeated for each infra host.
-# They could instead be applied as global settings in
-# user_variables, but are left here to illustrate that
-# each container could have different storage targets.
-storage_hosts:
-  controller00:
-    ip: 172.29.236.11
-    container_vars:
-      cinder_backends:
-        limit_container_types: cinder_volume
-        nfs_volume:
-          volume_backend_name: NFS_VOLUME1
-          volume_driver: cinder.volume.drivers.nfs.NfsDriver
-          nfs_mount_options: "rsize=65535,wsize=65535,timeo=1200,actimeo=120"
-          nfs_shares_config: /etc/cinder/nfs_shares
-          shares:
-            - ip: "172.29.244.14"
-              share: "/volumes"
-  controller01:
-    ip: 172.29.236.12
-    container_vars:
-      cinder_backends:
-        limit_container_types: cinder_volume
-        nfs_volume:
-          volume_backend_name: NFS_VOLUME1
-          volume_driver: cinder.volume.drivers.nfs.NfsDriver
-          nfs_mount_options: "rsize=65535,wsize=65535,timeo=1200,actimeo=120"
-          nfs_shares_config: /etc/cinder/nfs_shares
-          shares:
-            - ip: "172.29.244.14"
-              share: "/volumes"
-  controller02:
-    ip: 172.29.236.13
-    container_vars:
-      cinder_backends:
-        limit_container_types: cinder_volume
-        nfs_volume:
-          volume_backend_name: NFS_VOLUME1
-          volume_driver: cinder.volume.drivers.nfs.NfsDriver
-          nfs_mount_options: "rsize=65535,wsize=65535,timeo=1200,actimeo=120"
-          nfs_shares_config: /etc/cinder/nfs_shares
-          shares:
-            - ip: "172.29.244.14"
-              share: "/volumes"
diff --git a/xci/scenarios/os-nosdn-nofeature/role/os-nosdn-nofeature/files/mini/openstack_user_config.yml b/xci/scenarios/os-nosdn-nofeature/role/os-nosdn-nofeature/files/mini/openstack_user_config.yml
deleted file mode 100644
index 86b87c15..00000000
--- a/xci/scenarios/os-nosdn-nofeature/role/os-nosdn-nofeature/files/mini/openstack_user_config.yml
+++ /dev/null
@@ -1,170 +0,0 @@
----
-cidr_networks:
-  container: 172.29.236.0/22
-  tunnel: 172.29.240.0/22
-  storage: 172.29.244.0/22
-
-used_ips:
-  - "172.29.236.1,172.29.236.50"
-  - "172.29.240.1,172.29.240.50"
-  - "172.29.244.1,172.29.244.50"
-  - "172.29.248.1,172.29.248.50"
-
-global_overrides:
-  internal_lb_vip_address: 172.29.236.11
-  external_lb_vip_address: 192.168.122.3
-  tunnel_bridge: "br-vxlan"
-  management_bridge: "br-mgmt"
-  provider_networks:
-    - network:
-        container_bridge: "br-mgmt"
-        container_type: "veth"
-        container_interface: "eth1"
-        ip_from_q: "container"
-        type: "raw"
-        group_binds:
-          - all_containers
-          - hosts
-        is_container_address: true
-        is_ssh_address: true
-    - network:
-        container_bridge: "br-vxlan"
-        container_type: "veth"
-        container_interface: "eth10"
-        ip_from_q: "tunnel"
-        type: "vxlan"
-        range: "1:1000"
-        net_name: "vxlan"
-        group_binds:
-          - neutron_openvswitch_agent
-    - network:
-        container_bridge: "br-vlan"
-        container_type: "veth"
-        container_interface: "eth12"
-        host_bind_override: "eth12"
-        type: "flat"
-        net_name: "flat"
-        group_binds:
-          - neutron_openvswitch_agent
-    - network:
-        container_bridge: "br-vlan"
-        container_type: "veth"
-        container_interface: "eth11"
-        type: "vlan"
-        range: "1:1"
-        net_name: "vlan"
-        group_binds:
-          - neutron_openvswitch_agent
-    - network:
-        container_bridge: "br-storage"
-        container_type: "veth"
-        container_interface: "eth2"
-        ip_from_q: "storage"
-        type: "raw"
-        group_binds:
-          - glance_api
-          - cinder_api
-          - cinder_volume
-          - nova_compute
-
-# ##
-# ## Infrastructure
-# ##
-
-# galera, memcache, rabbitmq, utility
-shared-infra_hosts:
-  controller00:
-    ip: 172.29.236.11
-
-# repository (apt cache, python packages, etc)
-repo-infra_hosts:
-  controller00:
-    ip: 172.29.236.11
-
-# load balancer
-# Ideally the load balancer should not use the Infrastructure hosts.
-# Dedicated hardware is best for improved performance and security.
-haproxy_hosts:
-  controller00:
-    ip: 172.29.236.11
-
-# rsyslog server
-# log_hosts:
-# log1:
-#  ip: 172.29.236.14
-
-# ##
-# ## OpenStack
-# ##
-
-# keystone
-identity_hosts:
-  controller00:
-    ip: 172.29.236.11
-
-# cinder api services
-storage-infra_hosts:
-  controller00:
-    ip: 172.29.236.11
-
-# glance
-# The settings here are repeated for each infra host.
-# They could instead be applied as global settings in
-# user_variables, but are left here to illustrate that
-# each container could have different storage targets.
-image_hosts:
-  controller00:
-    ip: 172.29.236.11
-    container_vars:
-      limit_container_types: glance
-      glance_nfs_client:
-        - server: "172.29.244.12"
-          remote_path: "/images"
-          local_path: "/var/lib/glance/images"
-          type: "nfs"
-          options: "_netdev,auto"
-
-# nova api, conductor, etc services
-compute-infra_hosts:
-  controller00:
-    ip: 172.29.236.11
-
-# heat
-orchestration_hosts:
-  controller00:
-    ip: 172.29.236.11
-
-# horizon
-dashboard_hosts:
-  controller00:
-    ip: 172.29.236.11
-
-# neutron server, agents (L3, etc)
-network_hosts:
-  controller00:
-    ip: 172.29.236.11
-
-# nova hypervisors
-compute_hosts:
-  compute00:
-    ip: 172.29.236.12
-
-# cinder volume hosts (NFS-backed)
-# The settings here are repeated for each infra host.
-# They could instead be applied as global settings in
-# user_variables, but are left here to illustrate that
-# each container could have different storage targets.
-storage_hosts:
-  controller00:
-    ip: 172.29.236.11
-    container_vars:
-      cinder_backends:
-        limit_container_types: cinder_volume
-        nfs_volume:
-          volume_backend_name: NFS_VOLUME1
-          volume_driver: cinder.volume.drivers.nfs.NfsDriver
-          nfs_mount_options: "rsize=65535,wsize=65535,timeo=1200,actimeo=120"
-          nfs_shares_config: /etc/cinder/nfs_shares
-          shares:
-            - ip: "172.29.244.12"
-              share: "/volumes"
diff --git a/xci/scenarios/os-nosdn-nofeature/role/os-nosdn-nofeature/files/noha/openstack_user_config.yml b/xci/scenarios/os-nosdn-nofeature/role/os-nosdn-nofeature/files/noha/openstack_user_config.yml
deleted file mode 100644
index 99b768c4..00000000
--- a/xci/scenarios/os-nosdn-nofeature/role/os-nosdn-nofeature/files/noha/openstack_user_config.yml
+++ /dev/null
@@ -1,172 +0,0 @@
----
-cidr_networks:
-  container: 172.29.236.0/22
-  tunnel: 172.29.240.0/22
-  storage: 172.29.244.0/22
-
-used_ips:
-  - "172.29.236.1,172.29.236.50"
-  - "172.29.240.1,172.29.240.50"
-  - "172.29.244.1,172.29.244.50"
-  - "172.29.248.1,172.29.248.50"
-
-global_overrides:
-  internal_lb_vip_address: 172.29.236.11
-  external_lb_vip_address: 192.168.122.3
-  tunnel_bridge: "br-vxlan"
-  management_bridge: "br-mgmt"
-  provider_networks:
-    - network:
-        container_bridge: "br-mgmt"
-        container_type: "veth"
-        container_interface: "eth1"
-        ip_from_q: "container"
-        type: "raw"
-        group_binds:
-          - all_containers
-          - hosts
-        is_container_address: true
-        is_ssh_address: true
-    - network:
-        container_bridge: "br-vxlan"
-        container_type: "veth"
-        container_interface: "eth10"
-        ip_from_q: "tunnel"
-        type: "vxlan"
-        range: "1:1000"
-        net_name: "vxlan"
-        group_binds:
-          - neutron_openvswitch_agent
-    - network:
-        container_bridge: "br-vlan"
-        container_type: "veth"
-        container_interface: "eth12"
-        host_bind_override: "eth12"
-        type: "flat"
-        net_name: "flat"
-        group_binds:
-          - neutron_openvswitch_agent
-    - network:
-        container_bridge: "br-vlan"
-        container_type: "veth"
-        container_interface: "eth11"
-        type: "vlan"
-        range: "1:1"
-        net_name: "vlan"
-        group_binds:
-          - neutron_openvswitch_agent
-    - network:
-        container_bridge: "br-storage"
-        container_type: "veth"
-        container_interface: "eth2"
-        ip_from_q: "storage"
-        type: "raw"
-        group_binds:
-          - glance_api
-          - cinder_api
-          - cinder_volume
-          - nova_compute
-
-# ##
-# ## Infrastructure
-# ##
-
-# galera, memcache, rabbitmq, utility
-shared-infra_hosts:
-  controller00:
-    ip: 172.29.236.11
-
-# repository (apt cache, python packages, etc)
-repo-infra_hosts:
-  controller00:
-    ip: 172.29.236.11
-
-# load balancer
-# Ideally the load balancer should not use the Infrastructure hosts.
-# Dedicated hardware is best for improved performance and security.
-haproxy_hosts:
-  controller00:
-    ip: 172.29.236.11
-
-# rsyslog server
-# log_hosts:
-# log1:
-#  ip: 172.29.236.14
-
-# ##
-# ## OpenStack
-# ##
-
-# keystone
-identity_hosts:
-  controller00:
-    ip: 172.29.236.11
-
-# cinder api services
-storage-infra_hosts:
-  controller00:
-    ip: 172.29.236.11
-
-# glance
-# The settings here are repeated for each infra host.
-# They could instead be applied as global settings in
-# user_variables, but are left here to illustrate that
-# each container could have different storage targets.
-image_hosts:
-  controller00:
-    ip: 172.29.236.11
-    container_vars:
-      limit_container_types: glance
-      glance_nfs_client:
-        - server: "172.29.244.12"
-          remote_path: "/images"
-          local_path: "/var/lib/glance/images"
-          type: "nfs"
-          options: "_netdev,auto"
-
-# nova api, conductor, etc services
-compute-infra_hosts:
-  controller00:
-    ip: 172.29.236.11
-
-# heat
-orchestration_hosts:
-  controller00:
-    ip: 172.29.236.11
-
-# horizon
-dashboard_hosts:
-  controller00:
-    ip: 172.29.236.11
-
-# neutron server, agents (L3, etc)
-network_hosts:
-  controller00:
-    ip: 172.29.236.11
-
-# nova hypervisors
-compute_hosts:
-  compute00:
-    ip: 172.29.236.12
-  compute01:
-    ip: 172.29.236.13
-
-# cinder volume hosts (NFS-backed)
-# The settings here are repeated for each infra host.
-# They could instead be applied as global settings in
-# user_variables, but are left here to illustrate that
-# each container could have different storage targets.
-storage_hosts:
-  controller00:
-    ip: 172.29.236.11
-    container_vars:
-      cinder_backends:
-        limit_container_types: cinder_volume
-        nfs_volume:
-          volume_backend_name: NFS_VOLUME1
-          volume_driver: cinder.volume.drivers.nfs.NfsDriver
-          nfs_mount_options: "rsize=65535,wsize=65535,timeo=1200,actimeo=120"
-          nfs_shares_config: /etc/cinder/nfs_shares
-          shares:
-            - ip: "172.29.244.12"
-              share: "/volumes"
diff --git a/xci/scenarios/os-nosdn-nofeature/role/os-nosdn-nofeature/files/user_variables_os-nosdn-nofeature.yml b/xci/scenarios/os-nosdn-nofeature/role/os-nosdn-nofeature/files/user_variables_os-nosdn-nofeature.yml
deleted file mode 100644
index 2f678544..00000000
--- a/xci/scenarios/os-nosdn-nofeature/role/os-nosdn-nofeature/files/user_variables_os-nosdn-nofeature.yml
+++ /dev/null
@@ -1,35 +0,0 @@
----
-# Copyright (c) 2017 Ericsson AB and others.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# ##
-# ## This file contains commonly used overrides for convenience. Please inspect
-# ## the defaults for each role to find additional override options.
-# ##
-
-# Ensure the openvswitch kernel module is loaded
-openstack_host_specific_kernel_modules:
-  - name: "openvswitch"
-    pattern: "CONFIG_OPENVSWITCH"
-    group: "network_hosts"
-
-# neutron specific config
-neutron_plugin_type: ml2.ovs
-
-neutron_ml2_drivers_type: "flat,vlan,vxlan"
-
-neutron_provider_networks:
-  network_flat_networks: "*"
-  network_types: "vxlan"
-  network_vxlan_ranges: "1:1000"
\ No newline at end of file
diff --git a/xci/scenarios/os-nosdn-nofeature/role/os-nosdn-nofeature/tasks/main.yml b/xci/scenarios/os-nosdn-nofeature/role/os-nosdn-nofeature/tasks/main.yml
deleted file mode 100644
index 79aa3aa1..00000000
--- a/xci/scenarios/os-nosdn-nofeature/role/os-nosdn-nofeature/tasks/main.yml
+++ /dev/null
@@ -1,18 +0,0 @@
----
-# SPDX-license-identifier: Apache-2.0
-##############################################################################
-# Copyright (c) 2017 Ericsson AB and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-- 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"
-- 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"