diff options
| author | Giuseppe Scrivano <gscrivano@gnu.org> | 2017-02-10 16:01:46 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-10 16:01:46 +0100 |
| commit | e1e69ad8346a6938e1d58a852dbf2f8ad28eff6f (patch) | |
| tree | 8cabded134f0423b6d61cf95f00a574539d00db7 /roles/etcd/defaults | |
| parent | 07ca54fe406a533e70350aa9273d5a3df297f156 (diff) | |
| parent | b84a2cdcbdcbceed8da09485a9e9015378b5818f (diff) | |
| download | openshift-e1e69ad8346a6938e1d58a852dbf2f8ad28eff6f.tar.gz openshift-e1e69ad8346a6938e1d58a852dbf2f8ad28eff6f.tar.bz2 openshift-e1e69ad8346a6938e1d58a852dbf2f8ad28eff6f.tar.xz openshift-e1e69ad8346a6938e1d58a852dbf2f8ad28eff6f.zip | |
Merge pull request #3109 from giuseppe/system-containers
System containers
Diffstat (limited to 'roles/etcd/defaults')
| -rw-r--r-- | roles/etcd/defaults/main.yaml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/etcd/defaults/main.yaml b/roles/etcd/defaults/main.yaml index 2ec62c37c..e0746d70d 100644 --- a/roles/etcd/defaults/main.yaml +++ b/roles/etcd/defaults/main.yaml @@ -1,5 +1,5 @@ --- -etcd_service: "{{ 'etcd' if not etcd_is_containerized | bool else 'etcd_container' }}" +etcd_service: "{{ 'etcd' if openshift.common.is_etcd_system_container | bool or not etcd_is_containerized | bool else 'etcd_container' }}" etcd_client_port: 2379 etcd_peer_port: 2380 etcd_url_scheme: http |