diff options
| author | Paul Sokolovsky <pfalcon@users.sourceforge.net> | 2014-01-27 16:10:51 +0200 |
|---|---|---|
| committer | Paul Sokolovsky <pfalcon@users.sourceforge.net> | 2014-01-27 16:10:51 +0200 |
| commit | 3c4d5f308e61216fe8382d1cae050b6f193d4cfd (patch) | |
| tree | a31ae9e20a3bff7a84967bd87dd86df892c17dac | |
| parent | f7359e82322940937de52d81abda3bd7cb48da6a (diff) | |
Rename config option bzr_install -> vcs_install.
| -rw-r--r-- | linaro-ami/README | 3 | ||||
| -rw-r--r-- | linaro-ami/linaro-ami.conf | 2 | ||||
| -rw-r--r-- | linaro-ami/linaro_ami.py | 4 | ||||
| -rw-r--r-- | linaro-ami/tests/data/linaro-ami.conf | 2 |
4 files changed, 6 insertions, 5 deletions
diff --git a/linaro-ami/README b/linaro-ami/README index 6c29c7c..e21a684 100644 --- a/linaro-ami/README +++ b/linaro-ami/README @@ -84,7 +84,8 @@ instance_type Represents instance type for the custom AMI to be m1.large, m1.xlarge, m2.xlarge, m2.2xlarge, m2.4xlarge, c1.medium, c1.xlarge log_file Log file path. -bzr_install Bzr installation command. Can differ on different platforms. +vcs_install Version control system installation command. Can differ on + different platforms. key_name Temporary key pair name which will be created on the EC2. Key pair is deleted after the script creates the AMI. diff --git a/linaro-ami/linaro-ami.conf b/linaro-ami/linaro-ami.conf index 8b26817..2059693 100644 --- a/linaro-ami/linaro-ami.conf +++ b/linaro-ami/linaro-ami.conf @@ -5,7 +5,7 @@ [DEFAULT] instance_type = t1.micro log_file = linaro-ami.log -bzr_install = sudo apt-get --assume-yes install bzr +vcs_install = sudo apt-get --assume-yes install bzr key_name = linaro-ami-key [ab-natty-64bit] diff --git a/linaro-ami/linaro_ami.py b/linaro-ami/linaro_ami.py index 53a6255..9b76dd7 100644 --- a/linaro-ami/linaro_ami.py +++ b/linaro-ami/linaro_ami.py @@ -83,9 +83,9 @@ class LinaroAMI: time.sleep(2) self.log.debug("Connected to instance") - self.log.info("Installing bzr.") + self.log.info("Installing version control systems.") install_command_output = self.executor.execute(self.config.get( - "DEFAULT", "bzr_install")) + "DEFAULT", "vcs_install")) self.log.debug(install_command_output) self.log.info("Branching slave init repo.") diff --git a/linaro-ami/tests/data/linaro-ami.conf b/linaro-ami/tests/data/linaro-ami.conf index 4f50f81..8947fe3 100644 --- a/linaro-ami/tests/data/linaro-ami.conf +++ b/linaro-ami/tests/data/linaro-ami.conf @@ -3,7 +3,7 @@ [DEFAULT] instance_type = t1.micro log_file = linaro-ami.log -bzr_install = sudo apt-get --assume-yes install bzr +vcs_install = sudo apt-get --assume-yes install bzr key_name = ami-test-key [dummy-test] |