Remove insecure links for git:// protocol
To fix next error:
+ pip install -r tcp_tests/requirements.txt
ERROR: Command errored out with exit status 128: git clone -q git://github.com/openstack/fuel-devops.git /tmp/pip-req-build-wd2Zd1 Check the logs for full command output.
Also removed a useless code about adding Ceph node which is not needed
PROD-36643
Change-Id: I7f2dd13ceafa88906c24fa5aa62a5099cba392ba
diff --git a/tcp_tests/requirements.txt b/tcp_tests/requirements.txt
index 194b275..32df9cc 100644
--- a/tcp_tests/requirements.txt
+++ b/tcp_tests/requirements.txt
@@ -1,8 +1,7 @@
-# git+git://github.com/openstack/fuel-devops.git@887368d#egg=project[postgre] # Use this requirement for PostgreSQL
mock>=1.2,<4.0.0 # pinning first to avoid dependency meat grinder below
libvirt-python>=3.5.0,<4.1.0 # LGPLv2+
-git+git://github.com/openstack/fuel-devops.git@10f4ac744e89bfefcba3d7d009de82669c52fa6e # Use this requirement for Sqlite3, or if requirements for PostgreSQL are already installed
-git+git://github.com/dis-xcom/fuel-devops-driver-ironic
+git+https://github.com/openstack-archive/fuel-devops.git@10f4ac744e89bfefcba3d7d009de82669c52fa6e # Use this requirement for Sqlite3, or if requirements for PostgreSQL are already installed
+git+https://github.com/dis-xcom/fuel-devops-driver-ironic
paramiko
six
requests>=2.2.0
diff --git a/tcp_tests/tests/system/test_ceph_operations.py b/tcp_tests/tests/system/test_ceph_operations.py
index 55791ca..2a19258 100644
--- a/tcp_tests/tests/system/test_ceph_operations.py
+++ b/tcp_tests/tests/system/test_ceph_operations.py
@@ -432,16 +432,6 @@
assert job_result == 'SUCCESS', job_description
-@pytest.mark.usefixtures("add_xtra_node_to_salt",
- "wa_prod36167")
-class TestCephMgr(object):
- def test_add_node(self):
- pass
-
- def test_delete_node(self):
- pass
-
-
def build_node_config(node=''):
"""
@@ -472,7 +462,6 @@
#OSDSETTINGS
#MONSETTINGS
#RGWSETTINGS
- #MGRSETTINGS
linux_network_interfaces:
br_ctl:
address: ${_param:ceph_#NODE_node04_address}
@@ -502,9 +491,7 @@
'NODE': node,
'OSDSETTINGS': '',
'MONSETTINGS': '',
- 'RGWSETTINGS': '',
- 'MGRSETTINGS': '',
-
+ 'RGWSETTINGS': ''
}
# # ------------------OSD specific settings ----------
if node == 'osd':
@@ -526,10 +513,6 @@
keepalived_vip_priority: 104
""" # noqa: E501
- # # ------------------MGR specific settings -----------
- if node == 'mgr':
- data['MGRSETTINGS'] = ""
-
yaml_config = template.substitute(data)
return yaml_config