Merge lp://qastaging/~chad.smith/charms/precise/block-storage-broker/bsb-trusty-support into lp://qastaging/~chad.smith/charms/precise/block-storage-broker/trunk
Status: | Rejected |
---|---|
Rejected by: | Chad Smith |
Proposed branch: | lp://qastaging/~chad.smith/charms/precise/block-storage-broker/bsb-trusty-support |
Merge into: | lp://qastaging/~chad.smith/charms/precise/block-storage-broker/trunk |
Prerequisite: | lp://qastaging/~chad.smith/charms/precise/block-storage-broker/bsb-ec2-support |
Diff against target: |
1107 lines (+602/-255) 2 files modified
hooks/test_util.py (+394/-143) hooks/util.py (+208/-112) |
To merge this branch: | bzr merge lp://qastaging/~chad.smith/charms/precise/block-storage-broker/bsb-trusty-support |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Chad Smith | Disapprove | ||
Alberto Donato (community) | Needs Fixing | ||
Review via email:
|
Description of the change
This branch does a couple things:
1. stops the block-storage-
2. To handle the fact that euca-2.X doesn't report volume TAG responses in the euca-describe-
3. In using euca-describe-tags to augment existing volume data I found that tags can be orphaned once a volume is removed by an admin via euca-delete-volume, if that is the case we will ignore tags for volumes that don't exist and log a message
4. In unit tests drop all MockEuca* classes as they are no longer needed because we mock the subprocess.
By parsing the output from the euca-* commands, we shield ourselves from the internal changes in class structure definition in future euca releases. This branch adds very basic validation of euca-describe-
Unmerged revisions
- 90. By Chad Smith
-
pull in ack's _run_command patch for simplification
- 89. By Chad Smith
-
Ignore any orphaned TAG lines from euca-describe-tags that don't map to current existing volume-ids
- 88. By Chad Smith
-
revert Makefile change
- 87. By Chad Smith
-
merge fixes from bsb-ec2-support and resolve conflicts + lint
- 86. By Chad Smith
-
now that _ec2_describe_
volumes calls euca-describe-tags, we need to mock that in unit tests. Add unit tests for parse_ec2_*_reponse functions - 85. By Chad Smith
-
docstring updates
- 84. By Chad Smith
-
perform validation of INSTANCE reponse_type before attmpting to parse the value in the line. lint fixes in unit tests
- 83. By Chad Smith
-
parse euca-describe-
instances and euca-describe- volumes output instead of tying into euca2ools. commands. euca.describein stances directly
Here's a deployer bundle to deploy.
rm -rf ./trusty wherever you are about to juju-deployer from to ensure you don't use cached charm checkouts
cat block-storage- trusty. yaml
common:
options:
provider: block-storage- broker
volume_ size: 9
block- storage- broker- ec2:
options:
provider: ec2
key: <YOUR_EC2_ ACCESS_ KEY>
endpoint: <YOUR_EC2_URL>
secret: <YOUR_EC2_ SECRET_ KEY>
constraint s: mem=2048
options:
extra- packages: python-apt postgresql-contrib postgresql- 9.3-debversion
max_connectio ns: 500
services:
storage:
branch: lp:~chad.smith/charms/precise/storage/storage-volume-label-availability-zone
branch: lp:~chad.smith/charms/precise/block-storage-broker/bsb-trusty-support
postgresql:
branch: lp:~chad.smith/charms/precise/postgresql/postgresql-using-storage-subordinate
doit: broker- ec2]
inherits: common
series: trusty
relations:
- [postgresql, storage]
- [storage, block-storage-
juju-deployer -c block-storage- trusty. yaml doit