diff options
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/all-nodes-config.yaml | 6 | ||||
| -rw-r--r-- | puppet/services/ceph-base.yaml | 7 | ||||
| -rw-r--r-- | puppet/services/disabled/mongodb-disabled.yaml | 1 |
3 files changed, 7 insertions, 7 deletions
diff --git a/puppet/all-nodes-config.yaml b/puppet/all-nodes-config.yaml index 3044fe39..37c1d4e5 100644 --- a/puppet/all-nodes-config.yaml +++ b/puppet/all-nodes-config.yaml @@ -16,10 +16,6 @@ parameters: type: comma_delimited_list controller_ips: type: comma_delimited_list - logging_groups: - type: json - logging_sources: - type: json service_ips: type: json service_node_names: @@ -113,8 +109,6 @@ resources: bootstrap_nodeid_ip: {get_input: bootstrap_nodeid_ip} all_nodes: map_merge: - - tripleo::profile::base::logging::fluentd::fluentd_sources: {get_param: logging_sources} - - tripleo::profile::base::logging::fluentd::fluentd_groups: {get_param: logging_groups} - enabled_services: yaql: expression: $.data.distinct() diff --git a/puppet/services/ceph-base.yaml b/puppet/services/ceph-base.yaml index f6573f6c..8debf8c7 100644 --- a/puppet/services/ceph-base.yaml +++ b/puppet/services/ceph-base.yaml @@ -99,7 +99,6 @@ outputs: ceph::params::packages: - ceph-base - ceph-mon - - ceph-osd # NOTE: bind IP is found in Heat replacing the network name with the local node IP # for the given network; replacement examples (eg. for internal_api): # internal_api -> IP @@ -152,3 +151,9 @@ outputs: list_join: ['.', ['client', {get_param: CephClientUserName}]] MANILA_CLIENT_KEY: list_join: ['.', ['client', {get_param: ManilaCephFSNativeCephFSAuthId}]] + service_config_settings: + ceph_osd: + ceph::params::packages: + - ceph-base + - ceph-mon + - ceph-osd diff --git a/puppet/services/disabled/mongodb-disabled.yaml b/puppet/services/disabled/mongodb-disabled.yaml index c01a91fb..0c6e2bbb 100644 --- a/puppet/services/disabled/mongodb-disabled.yaml +++ b/puppet/services/disabled/mongodb-disabled.yaml @@ -39,6 +39,7 @@ outputs: upgrade_tasks: - name: Check for mongodb service stat: path=/usr/lib/systemd/system/mongod.service + tags: common register: mongod_service - name: Stop and disable mongodb service on upgrade tags: step1 |