Merge branch 'release/1.0.3'

Author: caaespin

consonance/Dockerfile_provisioner

@@ -54,6 +54,7 @@ RUN chmod u+x init_provisioner.sh
 # TODO: make sure you create these from the .template files and customize them
 RUN mkdir -p /root/.youxia /root/.consonance /root/.consonance/self-installs /root/.ssh
 COPY youxia_config /root/.youxia/config
+COPY logback.xml /root/logback.xml
 COPY config /root/.consonance/config
 COPY key.pem /root/.ssh/key.pem
 RUN chmod 600 /root/.ssh/key.pem

consonance/init_provisioner.sh

@@ -1,4 +1,9 @@
 #!/bin/bash
-
+#we put the logback.xml file in /root; so put that path first so the provisioner
+#uses those logging parameters instead of using the ones in consonance-arch-*.jar
+#which is in /
+#the '/' path is second so that the rest of the code is found in 
+#consonance-arch-*.jar
 cron -L 15 && echo "Cron Job set"
-java -cp consonance-arch-*.jar io.consonance.arch.containerProvisioner.ContainerProvisionerThreads --config config --endless | tee /consonance_logs/container_provisioner_nohup.out
+java -cp "/root/:./*" io.consonance.arch.containerProvisioner.ContainerProvisionerThreads --config config --endless | tee /consonance_logs/container_provisioner_nohup.out
+#java -cp consonance-arch-*.jar io.consonance.arch.containerProvisioner.ContainerProvisionerThreads --config config --endless | tee /consonance_logs/container_provisioner_nohup.out

consonance/logback.xml

@@ -0,0 +1,37 @@
+<!--
+  ~     Consonance - workflow software for multiple clouds
+  ~     Copyright (C) 2016 OICR
+  ~
+  ~     This program is free software: you can redistribute it and/or modify
+  ~     it under the terms of the GNU General Public License as published by
+  ~     the Free Software Foundation, either version 3 of the License, or
+  ~     (at your option) any later version.
+  ~
+  ~     This program is distributed in the hope that it will be useful,
+  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~     GNU General Public License for more details.
+  ~
+  ~     You should have received a copy of the GNU General Public License
+  ~     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  ~
+  -->
+
+<configuration>
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <!-- encoders are assigned the type
+        ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+        </encoder>
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>WARN</level>
+        </filter>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT" />
+    </root>
+</configuration>
+

install_bootstrap

@@ -370,6 +370,12 @@ while [[ "${run_consonance_launcher^^}" != 'Y' &&  "${run_consonance_launcher^^}
     fi
   done
 
+
+  email_address_for_owner_tag='email_address_for_owner_tag'
+  ask_question "What is the email address for the 'Owner' tag on the worker VM?" "$EMAIL_FOR_VM_OWNER_TAG" "Email for VM Owner tag" $email_address_for_owner_tag
+  sed -ie "s~{.*}~{\"Owner\":\"${email_address_for_owner_tag}\"}~" ./consonance/example_tags.json
+
+
   # Now write a config for this file.
   [[ -f commons_launcher_config/consonance.config ]] || mkdir -p commons_launcher_config
   # Note: You can't have ANY blank lines in .consonance/consonance.config because the python library that will eventually process it does not like blank lines and will fail.
@@ -410,7 +416,8 @@ while [[ "${run_consonance_launcher^^}" != 'Y' &&  "${run_consonance_launcher^^}
 "OS_ENDPOINT":"${user_os_endpoint}",
 "OS_NETWORK_ID":"${user_os_network_id}",
 "OS_REGION":"${user_os_region}",
-"OS_ZONE":"${user_os_zone}"
+"OS_ZONE":"${user_os_zone}",
+"EMAIL_FOR_VM_OWNER_TAG":"${email_address_for_owner_tag}"
 }
 CONFIG
   [[ -d "commons_launcher_config" ]] || mkdir "commons_launcher_config"