From 8f1214955b845a3ad7f39bd916ca8545230c55b7 Mon Sep 17 00:00:00 2001 From: Mike Julian Date: Wed, 7 Dec 2016 11:54:21 -0800 Subject: [PATCH] Fix bug so that Amazon loads the Amazon repo instead of the CentOS 6 repo --- .kitchen.yml | 23 +++++++++++++++++++++++ tasks/repo.yml | 2 +- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/.kitchen.yml b/.kitchen.yml index 377697e..e96da29 100644 --- a/.kitchen.yml +++ b/.kitchen.yml @@ -40,6 +40,29 @@ platforms: ssh_key: ~/.ssh/id_rsa provisioner: ansible_platform: 'amazon' + require_chef_for_busser: true + require_ruby_for_busser: false + verifier: + ruby_bindir: '/opt/chef/embedded/bin' + - name: amazonlinux-2016.09 + driver: + name: ec2 + image_id: ami-5ec1673e + aws_ssh_key_id: test-kitchen + region: us-west-2 + availability_zone: a + instance_type: t2.large + associate_public_ip: true + interface: dns + transport: + username: ec2-user + ssh_key: ~/.ssh/id_rsa + provisioner: + ansible_platform: 'amazon' + require_chef_for_busser: true + require_ruby_for_busser: false + verifier: + ruby_bindir: '/opt/chef/embedded/bin' # Ansible doesn't provide Debian repos so we use the omnibus installer to provide Ansible - name: debian-7 driver: diff --git a/tasks/repo.yml b/tasks/repo.yml index 2542b58..96260a6 100644 --- a/tasks/repo.yml +++ b/tasks/repo.yml @@ -71,6 +71,6 @@ yum_repository: name: 'librato_{{ librato_repo_base }}' description: 'librato_{{ librato_repo_base }}' - baseurl: '{{ librato_repo_url }}{{ librato_repo_base }}/el/6/$basearch' + baseurl: '{{ librato_repo_url }}librato-amazonlinux-collectd/el/6/$basearch' gpgcheck: no when: ansible_distribution == 'Amazon'