diff options
| author | Jason DeTiberus <jdetiber@redhat.com> | 2015-11-18 14:38:22 -0500 |
|---|---|---|
| committer | Jason DeTiberus <jdetiber@redhat.com> | 2015-11-18 14:51:46 -0500 |
| commit | f9d918450b27b8f7429f050ed5f781492406b385 (patch) | |
| tree | c4dbe821b26bcabbcec5bab07530cdb9f42ebf71 /filter_plugins | |
| parent | 31dbbf54a22202dfcce44dbb82f8bfcb4ea5181c (diff) | |
| download | openshift-f9d918450b27b8f7429f050ed5f781492406b385.tar.gz openshift-f9d918450b27b8f7429f050ed5f781492406b385.tar.bz2 openshift-f9d918450b27b8f7429f050ed5f781492406b385.tar.xz openshift-f9d918450b27b8f7429f050ed5f781492406b385.zip | |
small tweaks for adding docker volume for aws master hosts
Diffstat (limited to 'filter_plugins')
| -rw-r--r-- | filter_plugins/oo_filters.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/filter_plugins/oo_filters.py b/filter_plugins/oo_filters.py index 4dfa33a2c..e50cca6a7 100644 --- a/filter_plugins/oo_filters.py +++ b/filter_plugins/oo_filters.py @@ -220,7 +220,7 @@ class FilterModule(object): root_vol['delete_on_termination'] = True if root_vol['device_type'] != 'io1': root_vol.pop('iops', None) - if host_type in ['master', 'node']: + if host_type in ['master', 'node'] and 'docker' in data[host_type]: docker_vol = data[host_type]['docker'] docker_vol['device_name'] = '/dev/xvdb' docker_vol['delete_on_termination'] = True @@ -231,7 +231,7 @@ class FilterModule(object): docker_vol.pop('delete_on_termination', None) docker_vol['ephemeral'] = 'ephemeral0' return [root_vol, docker_vol] - elif host_type == 'etcd': + elif host_type == 'etcd' and 'etcd' in data[host_type]: etcd_vol = data[host_type]['etcd'] etcd_vol['device_name'] = '/dev/xvdb' etcd_vol['delete_on_termination'] = True |