Merge pull request #1191 from crawford/oem

coreos-base/oem-*: add config for etcd2
This commit is contained in:
Alex Crawford 2015-04-09 17:24:40 -07:00
commit dc9ce6ca2b
4 changed files with 32 additions and 0 deletions

View File

@ -10,6 +10,14 @@ coreos:
[Service] [Service]
Environment=ETCD_PEER_ELECTION_TIMEOUT=1200 Environment=ETCD_PEER_ELECTION_TIMEOUT=1200
- name: etcd2.service
runtime: true
drop-ins:
- name: 10-oem.conf
content: |
[Service]
Environment=ETCD_PEER_ELECTION_TIMEOUT=1200
- name: waagent.service - name: waagent.service
command: start command: start
runtime: true runtime: true

View File

@ -10,6 +10,14 @@ coreos:
[Service] [Service]
Environment=ETCD_PEER_ELECTION_TIMEOUT=1200 Environment=ETCD_PEER_ELECTION_TIMEOUT=1200
- name: etcd2.service
runtime: true
drop-ins:
- name: 10-oem.conf
content: |
[Service]
Environment=ETCD_PEER_ELECTION_TIMEOUT=1200
- name: oem-cloudinit.service - name: oem-cloudinit.service
command: restart command: restart
runtime: yes runtime: yes

View File

@ -10,6 +10,14 @@ coreos:
[Service] [Service]
Environment=ETCD_PEER_ELECTION_TIMEOUT=1200 Environment=ETCD_PEER_ELECTION_TIMEOUT=1200
- name: etcd2.service
runtime: true
drop-ins:
- name: 10-oem.conf
content: |
[Service]
Environment=ETCD_PEER_ELECTION_TIMEOUT=1200
- name: user-configdrive.service - name: user-configdrive.service
mask: yes mask: yes

View File

@ -10,6 +10,14 @@ coreos:
[Service] [Service]
Environment=ETCD_PEER_ELECTION_TIMEOUT=1200 Environment=ETCD_PEER_ELECTION_TIMEOUT=1200
- name: etcd2.service
runtime: true
drop-ins:
- name: 10-oem.conf
content: |
[Service]
Environment=ETCD_PEER_ELECTION_TIMEOUT=1200
- name: nova-agent-auto.service - name: nova-agent-auto.service
command: restart command: restart
runtime: yes runtime: yes