diff --git a/.travis.yml b/.travis.yml index afc1f6b8d..33eadef02 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,7 +21,8 @@ install: - pip install boto3 - pip install troposphere - printf '[defaults]\nroles_path=../' >ansible.cfg - - ansible-galaxy install -p ../ fiunchinho.wimpy,feature/build_app_with_compose + - ansible-galaxy install -p ../ fiunchinho.wimpy,feature/decouple_role + - ansible-galaxy install -p ../ fiunchinho.wimpy.build script: - ./mvnw package diff --git a/deploy/deploy.yml b/deploy/deploy.yml index d222219fc..a8d86f069 100644 --- a/deploy/deploy.yml +++ b/deploy/deploy.yml @@ -4,10 +4,18 @@ vars_files: - "{{ playbook_dir }}/{{ wimpy_deployment_environment }}.yml" vars: - wimpy_project: "spring-petclinic" + wimpy_project_name: "spring-petclinic" wimpy_docker_image_name: "fiunchinho/spring-petclinic" wimpy_app_port: 8080 - wimpy_needs_elb: True wimpy_aws_elb_scheme: "internet-facing" + wimpy_aws_elb_healthcheck: + ping_protocol: "http" + ping_port: 8080 + ping_path: "/" + response_timeout: 5 + interval: 6 + unhealthy_threshold: 2 + healthy_threshold: 3 roles: + - role: wimpy.build - role: fiunchinho.wimpy diff --git a/src/main/resources/static/resources/images/kitten.jpg b/src/main/resources/static/resources/images/kitten.jpg new file mode 100644 index 000000000..d3640bb38 Binary files /dev/null and b/src/main/resources/static/resources/images/kitten.jpg differ diff --git a/src/main/resources/templates/welcome.html b/src/main/resources/templates/welcome.html index 6b4ff0480..d4332dddc 100644 --- a/src/main/resources/templates/welcome.html +++ b/src/main/resources/templates/welcome.html @@ -7,10 +7,10 @@