diff options
author | Jason DeTiberus <jdetiber@redhat.com> | 2015-07-10 15:04:26 -0400 |
---|---|---|
committer | Jason DeTiberus <jdetiber@redhat.com> | 2015-07-10 15:13:33 -0400 |
commit | f752eaccbb1a5f0e2c1d36502f755d022a21d073 (patch) | |
tree | fa07d8258ee65b598e4cb16257b14f92cb8abf15 /filter_plugins/oo_filters.py | |
parent | add3fbcce31e9db4ea8c76acb9c8579f20581912 (diff) | |
download | openshift-f752eaccbb1a5f0e2c1d36502f755d022a21d073.tar.gz openshift-f752eaccbb1a5f0e2c1d36502f755d022a21d073.tar.bz2 openshift-f752eaccbb1a5f0e2c1d36502f755d022a21d073.tar.xz openshift-f752eaccbb1a5f0e2c1d36502f755d022a21d073.zip |
Playbook updates for clustered etcd
- Add support to bin/cluster for specifying etcd hosts
- defaults to 0, if no etcd hosts are selected, then configures embedded
etcd
- Updates for the byo inventory file for etcd and master as node by default
- Consolidation of cluster logic more centrally into common playbook
- Added etcd config support to playbooks
- Restructured byo playbooks to leverage the common openshift-cluster playbook
- Added support to common master playbook to generate and apply external etcd
client certs from the etcd ca
- start of refactor for better handling of master certs in a multi-master
environment.
- added the openshift_master_ca and openshift_master_certificates roles to
manage master certs instead of generating them in the openshift_master
role
- added etcd host groups to the cluster update playbooks
- aded better handling of host groups when they are either not present or are
empty.
- Update AWS readme
Diffstat (limited to 'filter_plugins/oo_filters.py')
-rw-r--r-- | filter_plugins/oo_filters.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/filter_plugins/oo_filters.py b/filter_plugins/oo_filters.py index 0f3f4fa9e..30b8819b8 100644 --- a/filter_plugins/oo_filters.py +++ b/filter_plugins/oo_filters.py @@ -175,9 +175,9 @@ class FilterModule(object): ''' if not issubclass(type(data), dict): raise errors.AnsibleFilterError("|failed expects first param is a dict") - if host_type not in ['master', 'node']: - raise errors.AnsibleFilterError("|failed expects either master or node" - " host type") + if host_type not in ['master', 'node', 'etcd']: + raise errors.AnsibleFilterError("|failed expects etcd, master or node" + " as the host type") root_vol = data[host_type]['root'] root_vol['device_name'] = '/dev/sda1' |