keith-turner commented on a change in pull request #338: URL: https://github.com/apache/fluo-muchos/pull/338#discussion_r436884030
########## File path: ansible/roles/elasticsearch/defaults/main.yml ########## @@ -0,0 +1,19 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +elasticsearch_rpm: elasticsearch-oss-7.7.0-x86_64.rpm +elasticsearch_sha512: 019ead696fb270b1cd045de2575f439d9417a7fa9e272c273c5e2d4c951a333aa4d71646a89dc28ce3add2f35e688e4f488ca464ca53ddc82935318870b28cc3 Review comment: I did not see this being used. ########## File path: ansible/docker.yml ########## @@ -29,8 +29,9 @@ executable: bash register: swarm_status changed_when: "'active' not in swarm_status.stdout_lines" - - name: initialize swarm - shell: > + - name: initialize swarm + shell: | + docker swarm leave --force || echo "leaving swarm for multiple setups" Review comment: This seems nice. Could consider making this its own little PR. Its fine leaving it as part of this one though. ########## File path: lib/muchos/ec2.py ########## @@ -322,8 +323,8 @@ def terminate(self): if path.isfile(self.config.hosts_path): os.remove(self.config.hosts_path) print("Removed hosts file at ", self.config.hosts_path) - else: - print("Aborted termination") + else: Review comment: Seems like the else should go with the `if response == "y":`, but I am not sure it does after this change. ########## File path: ansible/wipe.yml ########## @@ -32,6 +32,9 @@ - name: "wipe grafana db" file: path=/var/lib/grafana/grafana.db state=absent +<<<<<<< HEAD Review comment: This is some sort of merge conflict that needs to be resolved. ########## File path: ansible/roles/kibana/defaults/main.yml ########## @@ -0,0 +1,18 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +kibana_rpm: kibana-oss-7.6.0-x86_64.rpm Review comment: Would be good to have a hash for this file too. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [email protected]
