openstack/fuel-library
Code Issues Proposed changes

Fix paths

Browse Source
This commit is contained in:
vic 2012-11-23 16:58:26 +04:00
parent 4c7b8415fb
commit 5d8dae34f7
13 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fuel_test/ci/ci_base.py
View File

@ -96,7 +96,7 @@ class CiBase(object):
def setup_agent_nodes(self, nodes):
agent_config = load(
root('fuel', 'fuel_test', 'config', 'puppet.agent.config'))
root('fuel_test', 'config', 'puppet.agent.config'))
for node in nodes:
if node.name != 'master':
remote = ssh(

2
fuel_test/cobbler/cobbler_test_case.py
View File

@ -21,7 +21,7 @@ class CobblerTestCase(BaseTestCase):
cobbler = self.nodes.cobblers[0]
cobbler_address = cobbler.ip_address_by_network['internal']
self.write_site_pp_manifest(
root('fuel', 'deployment', 'puppet', 'cobbler', 'examples',
root('deployment', 'puppet', 'cobbler', 'examples',
'server_site.pp'),
server="'%s'" % cobbler_address,
name_server="'%s'" % cobbler_address,

10
fuel_test/helpers.py
View File

@ -78,7 +78,7 @@ def tempest_build_config_folsom(host, image_ref, image_ref_alt,
path_to_private_key,
compute_db_uri='mysql://user:pass@localhost/nova'):
sample = load(
root('fuel', 'fuel_test', 'config', 'tempest.conf.folsom.sample'))
root('fuel_test', 'config', 'tempest.conf.folsom.sample'))
config = sample % {
'IDENTITY_USE_SSL': 'false',
@ -137,7 +137,7 @@ def tempest_build_config_folsom(host, image_ref, image_ref_alt,
def tempest_build_config_essex(host, image_ref, image_ref_alt):
sample = load(
root('fuel', 'fuel_test', 'config', 'tempest.conf.essex.sample'))
root('fuel_test', 'config', 'tempest.conf.essex.sample'))
config = sample % {
'HOST': host,
'USERNAME': 'tempest1',
@ -352,14 +352,14 @@ def setup_puppet_master(remote):
def upload_recipes(remote, remote_dir="/etc/puppet/modules/"):
recipes_dir = root('fuel', 'deployment', 'puppet')
recipes_dir = root('deployment', 'puppet')
for dir in os.listdir(recipes_dir):
recipe_dir = os.path.join(recipes_dir, dir)
remote.mkdir(remote_dir)
remote.upload(recipe_dir, remote_dir)
def upload_keys(remote, remote_dir="/var/lib/puppet/"):
ssh_keys_dir = root('fuel', 'fuel_test', 'config', 'ssh_keys')
ssh_keys_dir = root('fuel_test', 'config', 'ssh_keys')
remote.upload(ssh_keys_dir, remote_dir)
@ -410,7 +410,7 @@ def make_shared_storage(remote, host, client_nodes, access_network):
def write_static_ip(remote, ip, net_mask, gateway, interface='eth0'):
path = '/etc/sysconfig/network-scripts/ifcfg-%s' % interface
text = load(root('fuel', 'fuel_test', 'config', 'ifcfg-eth0.config')) % {
text = load(root('fuel_test', 'config', 'ifcfg-eth0.config')) % {
'ip': str(ip), 'net_mask': str(net_mask),
'gateway': str(gateway), 'interface': str(interface)}
write_config(remote, path, text)

2
fuel_test/openstack/openstack_test_case.py
View File

@ -16,7 +16,7 @@ class OpenStackTestCase(BaseTestCase):
def write_openstack_sitepp(self, controller1, controller2):
self.write_site_pp_manifest(
root('fuel', 'deployment', 'puppet', 'openstack', 'examples',
root('deployment', 'puppet', 'openstack', 'examples',
'site.pp'),
internal_virtual_ip="'%s'" % self.ci().get_internal_virtual_ip(),
public_virtual_ip="'%s'" % self.ci().get_public_virtual_ip(),

2
fuel_test/openstack/prepare_for_tempest.py
View File

@ -55,7 +55,7 @@ class PrepareOpenStackForTempest(OpenStackTestCase):
host=auth_host,
image_ref=image_ref,
image_ref_alt=image_ref_alt,
path_to_private_key=root('fuel', 'fuel_test', 'config', 'ssh_keys', 'openstack'),
path_to_private_key=root('fuel_test', 'config', 'ssh_keys', 'openstack'),
compute_db_uri=compute_db_uri
))

6
fuel_test/openstack/test_apply_noop.py
View File

@ -21,7 +21,7 @@ class MyTestCase(OpenStackTestCase):
-3]
public_virtual_ip = self.environment.network['public'].ip_addresses[-3]
self.write_site_pp_manifest(
root('fuel', 'deployment', 'puppet', 'openstack', 'examples',
root('deployment', 'puppet', 'openstack', 'examples',
'site.pp'),
internal_virtual_ip="'%s'" % internal_virtual_ip,
public_virtual_ip="'%s'" % public_virtual_ip,
@ -52,7 +52,7 @@ class MyTestCase(OpenStackTestCase):
def test_deploy_mysql_with_galera(self):
self.write_site_pp_manifest(
root('fuel', 'deployment', 'puppet', 'mysql', 'examples',
root('deployment', 'puppet', 'mysql', 'examples',
'site.pp'),
master_hostname="'%s'" % self.nodes.controllers[0].name,
galera_master_ip="'%s'" %
@ -78,7 +78,7 @@ class MyTestCase(OpenStackTestCase):
def test_deploy_nova_rabbitmq(self):
self.write_site_pp_manifest(
root('fuel', 'deployment', 'puppet', 'nova', 'examples',
root('deployment', 'puppet', 'nova', 'examples',
'nova_rabbitmq_site.pp'),
cluster='true',
cluster_nodes=[

2
fuel_test/openstack_simple/openstack_simple_test_case.py
View File

@ -15,7 +15,7 @@ class OpenStackSimpleTestCase(BaseTestCase):
def write_openstack_sitepp(self, controller):
self.write_site_pp_manifest(
root('fuel', 'deployment', 'puppet', 'openstack', 'examples',
root('deployment', 'puppet', 'openstack', 'examples',
'site_simple.pp'),
floating_network_range="'%s'" % self.ci().get_floating_network(),
fixed_network_range="'%s'" % self.ci().get_fixed_network(),

2
fuel_test/openstack_swift/openstack_swift_test_case.py
View File

@ -39,7 +39,7 @@ class OpenStackSwiftTestCase(BaseTestCase):
self.write_site_pp_manifest(
root('fuel', 'deployment', 'puppet', 'openstack', 'examples',
root('deployment', 'puppet', 'openstack', 'examples',
'site_openstack_swift_standalone.pp'),
internal_virtual_ip="'%s'" % self.ci().get_internal_virtual_ip(),
public_virtual_ip="'%s'" % self.ci().get_public_virtual_ip(),

2
fuel_test/openstack_swift/prepare_for_tempest.py
View File

@ -35,7 +35,7 @@ class PrepareOpenStackSwiftForTempest(OpenStackSwiftTestCase):
host=auth_host,
image_ref=image_ref,
image_ref_alt=image_ref_alt,
path_to_private_key=root('fuel', 'fuel_test', 'config', 'ssh_keys', 'openstack'),
path_to_private_key=root('fuel_test', 'config', 'ssh_keys', 'openstack'),
compute_db_uri=compute_db_uri
))

2
fuel_test/openstack_swift_compact/openstack_swift_compact_test_case.py
View File

@ -28,7 +28,7 @@ class OpenStackSwiftCompactTestCase(BaseTestCase):
else:
controller_internal_addresses +="}"
self.write_site_pp_manifest(
root('fuel', 'deployment', 'puppet', 'openstack', 'examples',
root('deployment', 'puppet', 'openstack', 'examples',
'site_openstack_swift_compact.pp'),
internal_virtual_ip="'%s'" % self.ci().get_internal_virtual_ip(),
public_virtual_ip="'%s'" % self.ci().get_public_virtual_ip(),

2
fuel_test/openstack_swift_compact/prepare_for_tempest.py
View File

@ -39,7 +39,7 @@ class PrepareOpenStackSwiftCompactForTempest(OpenStackSwiftCompactTestCase):
host=auth_host,
image_ref=image_ref,
image_ref_alt=image_ref_alt,
path_to_private_key=root('fuel', 'fuel_test', 'config', 'ssh_keys', 'openstack'),
path_to_private_key=root('fuel_test', 'config', 'ssh_keys', 'openstack'),
compute_db_uri=compute_db_uri
))

2
fuel_test/root.py
View File

@ -1,6 +1,6 @@
import os
here = lambda * x: os.path.join(os.path.abspath(os.path.dirname(__file__)), *x)
REPOSITORY_ROOT = here('../..')
REPOSITORY_ROOT = here('..')
root = lambda * x: os.path.join(os.path.abspath(REPOSITORY_ROOT), *x)

2
fuel_test/swift/test_swift.py
View File

@ -14,7 +14,7 @@ class SwiftCase(BaseTestCase):
def test_deploy_swift(self):
self.write_site_pp_manifest(
root('fuel', 'deployment', 'puppet', 'swift', 'examples',
root('deployment', 'puppet', 'swift', 'examples',
'site.pp'),
swift_proxy_address="'%s'" %
self.nodes.proxies[0].ip_address_by_network[