openstack/fuel-library
Code Issues Proposed changes

Change default domain to your-domain-name.com

Browse Source
This commit is contained in:
vic 2012-12-10 19:30:34 +04:00 committed by Gerrit Code Review
parent c61ef0d1dc
commit 04265c3c67
8 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deployment/puppet/cobbler/examples/site.pp
View File

@ -6,7 +6,7 @@ node default {
notify { "test-notification-${hostname}": }
}
node /^(fuel-pm|fuel-cobbler).mirantis.com/ {
node /^(fuel-pm|fuel-cobbler).your-domain-name.com/ {
class{cobbler::nat:
nat_range => '10.0.0.0',

2
deployment/puppet/cobbler/manifests/init.pp
View File

@ -27,7 +27,7 @@ class cobbler(
$server = $ipaddress,
$domain_name = 'mirantis.com',
$domain_name = 'your-domain-name.com',
$name_server = $ipaddress,
$next_server = $ipaddress,

2
deployment/puppet/mcollective/examples/site.pp
View File

@ -13,7 +13,7 @@ class { 'openstack::mirantis_repos':
disable_puppet_labs_repos => false,
}
node /fuel-mcollective.mirantis.com/ {
node /fuel-mcollective.your-domain-name.com/ {
class { mcollective::rabbitmq:
stompuser => $stompuser,

4
deployment/puppet/puppet/examples/site.pp
View File

@ -11,9 +11,9 @@
class {puppet::thin: }
class { "puppet::nginx":
puppet_master_hostname => "product-centos.mirantis.com",
puppet_master_hostname => "product-centos.your-domain-name.com",
}
class { "puppet::agent_config":
server => "product-centos.mirantis.com"
server => "product-centos.your-domain-name.com"
}

4
fuel_test/ci/ci_base.py
View File

@ -86,7 +86,7 @@ class CiBase(object):
def add_nodes_to_hosts(self, remote, nodes):
for node in nodes:
add_to_hosts(remote, node.ip_address_by_network['internal'], node.name,
node.name + '.mirantis.com')
node.name + '.your-domain-name.com')
def setup_master_node(self, master_remote, nodes):
setup_puppet_master(master_remote)
@ -122,7 +122,7 @@ class CiBase(object):
def rename_nodes(self, nodes):
for node in nodes:
remote = ssh(node.ip_address_by_network['public'], username='root', password='r00tme')
change_host_name(remote, node.name, node.name + '.mirantis.com')
change_host_name(remote, node.name, node.name + '.your-domain-name.com')
logging.info("Renamed %s" % node.name)
def setup_environment(self):

8
fuel_test/cobbler/test_cobbler.py
View File

@ -93,9 +93,9 @@ class CobblerCase(CobblerTestCase):
ks_meta=self.get_ks_meta('master',
stomp_name),
name=node_name,
hostname=node_name + ".mirantis.com",
hostname=node_name + ".your-domain-name.com",
name_servers=cobbler.ip_address_by_network['internal'],
name_servers_search="mirantis.com",
name_servers_search="your-domain-name.com",
profile=profile,
netboot_enabled="1")
client.modify_system(system_id, 'modify_interface', {
@ -103,7 +103,7 @@ class CobblerCase(CobblerTestCase):
"static-eth0": "0",
"macaddress-eth1": str(node_mac1),
"ipaddress-eth1": str(node_ip),
"dnsname-eth1": node_name + ".mirantis.com",
"dnsname-eth1": node_name + ".your-domain-name.com",
"static-eth1": "1",
"macaddress-eth2": str(node_mac2),
"static-eth2": "0"
@ -144,7 +144,7 @@ class CobblerCase(CobblerTestCase):
remote,
master.ip_address_by_network['internal'],
master.name,
master.name + ".mirantis.com")
master.name + ".your-domain-name.com")
for node in self.environment.nodes:
node.save_snapshot('cobbler-configured', force=True)

2
fuel_test/config/puppet.agent.config
View File

@ -24,7 +24,7 @@
# The default value is '$confdir/localconfig'.
localconfig = $vardir/localconfig
server = master.mirantis.com
server = master.your-domain-name.com
pluginsync = true
[master]

2
fuel_test/helpers.py
View File

@ -353,7 +353,7 @@ def setup_puppet_master(remote):
puppet_apply(remote.sudo.ssh,
'class {puppet: puppet_master_version => "%s"}'
'-> class {puppet::thin:}'
'-> class {puppet::nginx: puppet_master_hostname => "master.mirantis.com"}'
'-> class {puppet::nginx: puppet_master_hostname => "master.your-domain-name.com"}'
% PUPPET_VERSION)
remote.mkdir('/var/lib/puppet/ssh_keys')
puppet_apply(remote.sudo.ssh, 'class {puppet::fileserver_config:}')