summaryrefslogtreecommitdiff
path: root/google_compute_engine/instance_setup
diff options
context:
space:
mode:
authorLucas Kanashiro <kanashiro.duarte@gmail.com>2018-10-26 19:15:07 -0300
committerZach Marano <zmarano@google.com>2018-10-26 15:15:07 -0700
commit492ccb5a49f32245d9e275c1c1c419202085e531 (patch)
tree35d23b39983425ecd7390c2e1f61d7b3b1f647b4 /google_compute_engine/instance_setup
parent5641130e708c34372404dad9f7b0c0a40d2d0db2 (diff)
downloadgoogle-compute-image-packages-492ccb5a49f32245d9e275c1c1c419202085e531.tar.gz
Add prefix 'google' to scripts inside 'scripts' dir (#672)
The scripts inside 'scripts' directory have general names that makes difficult identify from which package they belong to.
Diffstat (limited to 'google_compute_engine/instance_setup')
-rwxr-xr-xgoogle_compute_engine/instance_setup/instance_setup.py4
-rw-r--r--google_compute_engine/instance_setup/tests/instance_setup_test.py4
2 files changed, 4 insertions, 4 deletions
diff --git a/google_compute_engine/instance_setup/instance_setup.py b/google_compute_engine/instance_setup/instance_setup.py
index 0a4301f..80785e9 100755
--- a/google_compute_engine/instance_setup/instance_setup.py
+++ b/google_compute_engine/instance_setup/instance_setup.py
@@ -61,9 +61,9 @@ class InstanceSetup(object):
self._SetupBotoConfig()
if self.instance_config.GetOptionBool(
'InstanceSetup', 'optimize_local_ssd'):
- self._RunScript('optimize_local_ssd')
+ self._RunScript('google_optimize_local_ssd')
if self.instance_config.GetOptionBool('InstanceSetup', 'set_multiqueue'):
- self._RunScript('set_multiqueue')
+ self._RunScript('google_set_multiqueue')
try:
self.instance_config.WriteConfig()
except (IOError, OSError) as e:
diff --git a/google_compute_engine/instance_setup/tests/instance_setup_test.py b/google_compute_engine/instance_setup/tests/instance_setup_test.py
index bf7c18b..97a4674 100644
--- a/google_compute_engine/instance_setup/tests/instance_setup_test.py
+++ b/google_compute_engine/instance_setup/tests/instance_setup_test.py
@@ -81,11 +81,11 @@ class InstanceSetupTest(unittest.TestCase):
# Setup for local SSD.
mock.call.config.InstanceConfig().GetOptionBool(
'InstanceSetup', 'optimize_local_ssd'),
- mock.call.setup._RunScript('optimize_local_ssd'),
+ mock.call.setup._RunScript('google_optimize_local_ssd'),
# Setup for multiqueue virtio driver.
mock.call.config.InstanceConfig().GetOptionBool(
'InstanceSetup', 'set_multiqueue'),
- mock.call.setup._RunScript('set_multiqueue'),
+ mock.call.setup._RunScript('google_set_multiqueue'),
# Write the updated config file.
mock.call.config.InstanceConfig().WriteConfig(),
]