Browse Source

Change ohaisolo and poshohai domains

This replaces the URLs for Ohai-Solo and Posh-Ohai to use a
rackspace.com domain in order to help properly identitfy the source of
the packages and prevent confusion to users on what is being done.

In the future, this URL should be fully customizable to allow for
someone to host their own Ohai-Solo/Posh-Ohai packages if they so
choose.

Closes-Bug: #1386745

Change-Id: If2b58846eb47c550614a94d73bdf33ac79ff9cf5
changes/73/131473/2
Ryan Walker 6 years ago
parent
commit
5674cbd833
3 changed files with 5 additions and 4 deletions
  1. +2
    -1
      satori/sysinfo/ohai_solo.py
  2. +2
    -2
      satori/sysinfo/posh_ohai.py
  3. +1
    -1
      satori/tests/test_sysinfo_ohai_solo.py

+ 2
- 1
satori/sysinfo/ohai_solo.py View File

@ -111,7 +111,8 @@ def perform_install(client):
"Target platform was %s", client.platform_info['dist'])
else:
# Download to host
command = "wget -N http://ohai.rax.io/install.sh"
command = ("wget -N http://readonly.configdiscovery.rackspace.com"
"/install.sh")
output = client.execute(command, cwd='/tmp', escalate=True,
allow_many=False)
LOG.debug("Downloaded ohai-solo | %s", output['stdout'])


+ 2
- 2
satori/sysinfo/posh_ohai.py View File

@ -100,8 +100,8 @@ def perform_install(client):
if is_windows:
powershell_command = ('[scriptblock]::Create((New-Object -TypeName '
'System.Net.WebClient).DownloadString('
'"http://ohai.rax.io/deploy.ps1"))'
'.Invoke()')
'"http://readonly.configdiscovery.rackspace.com'
'/deploy.ps1")).Invoke()')
# check output to ensure that installation was successful
# if not, raise SystemInfoCommandInstallFailed
output = client.execute(powershell_command)


+ 1
- 1
satori/tests/test_sysinfo_ohai_solo.py View File

@ -61,7 +61,7 @@ class TestOhaiInstall(utils.TestCase):
self.assertEqual(result, response)
self.assertEqual(self.mock_remotesshclient.execute.call_count, 3)
self.mock_remotesshclient.execute.assert_has_calls([
mock.call('wget -N http://ohai.rax.io/install.sh', cwd='/tmp',
mock.call('wget -N http://readonly.configdiscovery.rackspace.com/install.sh', cwd='/tmp',
escalate=True, allow_many=False),
mock.call('bash install.sh', cwd='/tmp', with_exit_code=True,
escalate=True, allow_many=False),


Loading…
Cancel
Save