diff options
| author | Scott Dodson <sdodson@redhat.com> | 2015-04-30 17:04:15 -0400 |
|---|---|---|
| committer | Jason DeTiberus <jdetiber@redhat.com> | 2015-06-10 11:29:23 -0400 |
| commit | b57392ddd54bbff225ba83dd5a5bf40ea99344a4 (patch) | |
| tree | 28700b81ad52e4535604a4646baeea1c54b880c9 /roles/openshift_sdn_master | |
| parent | fe458e2c29bffdab7708b67539a36a08506560da (diff) | |
| download | openshift-b57392ddd54bbff225ba83dd5a5bf40ea99344a4.tar.gz openshift-b57392ddd54bbff225ba83dd5a5bf40ea99344a4.tar.bz2 openshift-b57392ddd54bbff225ba83dd5a5bf40ea99344a4.tar.xz openshift-b57392ddd54bbff225ba83dd5a5bf40ea99344a4.zip | |
Accomodate upstream configuration change
- Master config and certificates are now in /etc/openshift/master
- Node config is now in /etc/openshift/node
- Several certificates have been renamed to accomodate a flattening of
structure to accomodate secret storage
- Add openshift_data_dir to ensure etcd and volumes are stored in
/var/lib/openshift
- Add openshift_generated_configs_dir
Diffstat (limited to 'roles/openshift_sdn_master')
| -rw-r--r-- | roles/openshift_sdn_master/tasks/main.yml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/roles/openshift_sdn_master/tasks/main.yml b/roles/openshift_sdn_master/tasks/main.yml index 77e7a80ba..e64199b74 100644 --- a/roles/openshift_sdn_master/tasks/main.yml +++ b/roles/openshift_sdn_master/tasks/main.yml @@ -24,9 +24,9 @@ dest: /etc/sysconfig/openshift-sdn-master regexp: '^OPTIONS=' line: "OPTIONS=\"-v={{ openshift.master_sdn.debug_level }} -etcd-endpoints={{ openshift_sdn_master_url}} - -etcd-cafile={{ openshift_cert_dir }}/ca/ca.crt - -etcd-certfile={{ openshift_cert_dir }}/openshift-client/cert.crt - -etcd-keyfile={{ openshift_cert_dir }}/openshift-client/key.key\"" + -etcd-cafile={{ openshift_master_config_dir }}/ca.crt + -etcd-certfile={{ openshift_master_config_dir }}/master.etcd-client.crt + -etcd-keyfile={{ openshift_master_config_dir }}/master.etcd-client.key\"" notify: - restart openshift-sdn-master |