diff options
| author | Michael Gugino <mgugino@redhat.com> | 2017-12-13 12:42:32 -0500 |
|---|---|---|
| committer | Michael Gugino <mgugino@redhat.com> | 2017-12-18 16:46:22 -0500 |
| commit | 801779eeb6f6308f81ae7c48409de7686c04a0aa (patch) | |
| tree | b6e4e6fcf8b672f5c5ed1269e7ed0c93258090f3 /roles/openshift_prometheus | |
| parent | 84266ade6839f9a82e3111f12fce64b88a48845a (diff) | |
| download | openshift-801779eeb6f6308f81ae7c48409de7686c04a0aa.tar.gz openshift-801779eeb6f6308f81ae7c48409de7686c04a0aa.tar.bz2 openshift-801779eeb6f6308f81ae7c48409de7686c04a0aa.tar.xz openshift-801779eeb6f6308f81ae7c48409de7686c04a0aa.zip | |
Relocate filter plugins to lib_utils
This commit relocates filter_plugings to lib_utils,
changes the namespacing to prevent unintended use of
older versions that may be present in filter_plugins/
directory on existing installs.
Add lib_utils to meta depends for roles
Also consolidate some plugins into lib_utils from
various other areas.
Update rpm spec, obsolete plugin rpms.
Diffstat (limited to 'roles/openshift_prometheus')
| -rw-r--r-- | roles/openshift_prometheus/meta/main.yaml | 5 | ||||
| -rw-r--r-- | roles/openshift_prometheus/tasks/install_prometheus.yaml | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/roles/openshift_prometheus/meta/main.yaml b/roles/openshift_prometheus/meta/main.yaml index 33188bb7e..69c5e0ee2 100644 --- a/roles/openshift_prometheus/meta/main.yaml +++ b/roles/openshift_prometheus/meta/main.yaml @@ -15,5 +15,6 @@ galaxy_info: categories: - openshift dependencies: -- { role: lib_openshift } -- { role: openshift_facts } +- role: lib_openshift +- role: openshift_facts +- role: lib_utils diff --git a/roles/openshift_prometheus/tasks/install_prometheus.yaml b/roles/openshift_prometheus/tasks/install_prometheus.yaml index abc5dd476..2fb1c08e5 100644 --- a/roles/openshift_prometheus/tasks/install_prometheus.yaml +++ b/roles/openshift_prometheus/tasks/install_prometheus.yaml @@ -5,7 +5,7 @@ oc_project: state: present name: "{{ openshift_prometheus_namespace }}" - node_selector: "{{ openshift_prometheus_node_selector | oo_selector_to_string_list() }}" + node_selector: "{{ openshift_prometheus_node_selector | lib_utils_oo_selector_to_string_list() }}" description: Prometheus # secrets @@ -16,7 +16,7 @@ namespace: "{{ openshift_prometheus_namespace }}" contents: - path: session_secret - data: "{{ 43 | oo_random_word }}=" + data: "{{ 43 | lib_utils_oo_random_word }}=" with_items: - prometheus - alerts |