diff options
| author | ewolinetz <ewolinet@redhat.com> | 2017-04-20 18:59:57 -0500 |
|---|---|---|
| committer | ewolinetz <ewolinet@redhat.com> | 2017-04-21 15:49:38 -0500 |
| commit | 66f18efad7176eb4f1ad1926a9a3b5d96aa72e2f (patch) | |
| tree | 670368473f764caa2c3d875b6e353f8fbc3b6502 /docs/proposals | |
| parent | 1c402c309f1b507f95fb1db048a136453ea1494b (diff) | |
| download | openshift-66f18efad7176eb4f1ad1926a9a3b5d96aa72e2f.tar.gz openshift-66f18efad7176eb4f1ad1926a9a3b5d96aa72e2f.tar.bz2 openshift-66f18efad7176eb4f1ad1926a9a3b5d96aa72e2f.tar.xz openshift-66f18efad7176eb4f1ad1926a9a3b5d96aa72e2f.zip | |
Updating snippet contents, formatting and providing urls
Diffstat (limited to 'docs/proposals')
| -rw-r--r-- | docs/proposals/role_decomposition.md | 63 |
1 files changed, 28 insertions, 35 deletions
diff --git a/docs/proposals/role_decomposition.md b/docs/proposals/role_decomposition.md index 1b62e6629..228b7de12 100644 --- a/docs/proposals/role_decomposition.md +++ b/docs/proposals/role_decomposition.md @@ -89,12 +89,29 @@ providing the location of the generated certificates to the individual roles. #### Snippets -openshift_logging/tasks/install_logging.yaml -``` -- name: Install logging - include: "{{ role_path }}/tasks/install_support.yaml" - when: openshift_hosted_logging_install | default(true) | bool +[openshift_logging/tasks/install_logging.yaml](https://github.com/ewolinetz/openshift-ansible/blob/logging_component_subroles/roles/openshift_logging/tasks/install_logging.yaml) +```yaml +- name: Gather OpenShift Logging Facts + openshift_logging_facts: + oc_bin: "{{openshift.common.client_binary}}" + openshift_logging_namespace: "{{openshift_logging_namespace}}" + +- name: Set logging project + oc_project: + state: present + name: "{{ openshift_logging_namespace }}" + +- name: Create logging cert directory + file: + path: "{{ openshift.common.config_base }}/logging" + state: directory + mode: 0755 + changed_when: False + check_mode: no +- include: generate_certs.yaml + vars: + generated_certs_dir: "{{openshift.common.config_base}}/logging" ## Elasticsearch - include_role: @@ -191,8 +208,8 @@ openshift_logging/tasks/install_logging.yaml - include: update_master_config.yaml ``` -openshift_logging_elasticsearch/meta/main.yaml -``` +[openshift_logging_elasticsearch/meta/main.yaml](https://github.com/ewolinetz/openshift-ansible/blob/logging_component_subroles/roles/openshift_logging_elasticsearch/meta/main.yaml) +```yaml --- galaxy_info: author: OpenShift Red Hat @@ -210,8 +227,8 @@ dependencies: - role: lib_openshift ``` -openshift_logging/meta/main.yaml -``` +[openshift_logging/meta/main.yaml](https://github.com/ewolinetz/openshift-ansible/blob/logging_component_subroles/roles/openshift_logging/meta/main.yaml) +```yaml --- galaxy_info: author: OpenShift Red Hat @@ -230,8 +247,8 @@ dependencies: - role: openshift_facts ``` -openshift_logging/tasks/install_support.yaml [old] -``` +[openshift_logging/tasks/install_support.yaml - old](https://github.com/openshift/openshift-ansible/blob/master/roles/openshift_logging/tasks/install_support.yaml) +```yaml --- # This is the base configuration for installing the other components - name: Check for logging project already exists @@ -288,30 +305,6 @@ openshift_logging/tasks/install_support.yaml [old] - include: generate_routes.yaml ``` -openshift_logging/tasks/install_support.yaml [new] -``` ---- -# This is the base configuration for installing the other components -- name: Set logging project - oc_project: - state: present - name: "{{ openshift_logging_namespace }}" - -- name: Create logging cert directory - file: path={{openshift.common.config_base}}/logging state=directory mode=0755 - changed_when: False - check_mode: no - -- include: generate_certs.yaml - vars: - generated_certs_dir: "{{openshift.common.config_base}}/logging" - -- name: Create temp directory for all our templates - file: path={{mktemp.stdout}}/templates state=directory mode=0755 - changed_when: False - check_mode: no -``` - # Limitations There will always be exceptions for some of these rules, however the majority of |