Przeglądaj źródła

changed oso_host_monitoring to use the oo_ vars

Thomas Wiest 9 lat temu
rodzic
commit
0f7d54211a

+ 3 - 3
roles/oso_host_monitoring/templates/oso-rhel7-host-monitoring.service.j2

@@ -43,13 +43,13 @@ ExecStart=/usr/bin/docker run --name {{ osohm_host_monitoring }}
            -e ZAGG_URL={{ osohm_zagg_web_url }}                                              \
            -e ZAGG_USER={{ osohm_default_zagg_server_user }}                                 \
            -e ZAGG_PASSWORD={{ osohm_default_zagg_server_password }}                         \
-           -e ZAGG_CLIENT_HOSTNAME={{ ec2_tag_Name }}                                        \
+           -e ZAGG_CLIENT_HOSTNAME={{ oo_name }}                                        \
            -e ZAGG_SSL_VERIFY={{ osohm_zagg_verify_ssl }}                                    \
            -e OSO_CLUSTER_GROUP={{ cluster_group }}                                          \
            -e OSO_CLUSTER_ID={{ oo_clusterid }}                                              \
            -e OSO_ENVIRONMENT={{ oo_environment }}                                           \
-           -e OSO_HOST_TYPE={{ hostvars[inventory_hostname]['ec2_tag_host-type'] }}          \
-           -e OSO_SUB_HOST_TYPE={{ hostvars[inventory_hostname]['ec2_tag_sub-host-type'] }}  \
+           -e OSO_HOST_TYPE={{ hostvars[inventory_hostname]['oo_hosttype'] }}          \
+           -e OSO_SUB_HOST_TYPE={{ hostvars[inventory_hostname]['oo_subhosttype'] }}  \
            -e OSO_MASTER_HA={{ osohm_master_ha }}                                            \
            -v /etc/localtime:/etc/localtime                                                  \
            -v /sys:/sys:ro                                                                   \