Merge pull request #23 from onigra/modify_sample_ansible_playbook

Modify sample ansible playbook

spec/samples/ansible_playbook/staging.yml

@@ -1,7 +1,7 @@
 ---
 - hosts:
-  - tag_Name_tsudura-ami
-  sudo: yes
+    - tag_Name_tsudura_ami
+  become: yes
   vars_files:
     - vault_var.yml
   roles:

spec/samples/yamls/has_not_iam_instance_profile.yml

@@ -3,12 +3,16 @@ environment: staging
 region: ap-northeast-1
 security_group_id: sg-2f1e854a
 subnet_id: subnet-cd985794
-image_id: ami-cbf90ecb
+image_id: ami-56d4ad31
 key_name: tsudura_sample
 playbook_path: "spec/samples/ansible_playbook/staging.yml"
 inventory_file: "~/.ansible/ec2.py"
 vault_password: <%= ENV["VAULT_PASSWORD"] %>
 instance_type: t2.micro
-user_data_script: "#!/bin/bash -ex\nsu - deploy /home/deploy/startup.sh staging"
+user_data_script: >
+  #cloud-config
+
+  runcmd:
+    - su - deploy /home/deploy/startup.sh staging
 auto_scaling_group_name: tsudura-stg-blue
 owner: <%= ENV["OWNER"] %>

spec/samples/yamls/has_not_vault_pass.yml

@@ -0,0 +1,18 @@
+service: tsudura
+environment: staging
+region: ap-northeast-1
+security_group_id: sg-2f1e854a
+subnet_id: subnet-cd985794
+image_id: ami-56d4ad31
+key_name: tsudura_sample
+iam_instance_profile: tsudura_role
+playbook_path: "spec/samples/ansible_playbook/staging.yml"
+inventory_file: "~/.ansible/ec2.py"
+instance_type: t2.micro
+user_data_script: >
+  #cloud-config
+
+  runcmd:
+    - su - deploy /home/deploy/startup.sh staging
+auto_scaling_group_name: tsudura-stg-blue
+owner: <%= ENV["OWNER"] %>

spec/samples/yamls/normal.yml

@@ -3,13 +3,17 @@ environment: staging
 region: ap-northeast-1
 security_group_id: sg-2f1e854a
 subnet_id: subnet-cd985794
-image_id: ami-cbf90ecb
+image_id: ami-56d4ad31
 key_name: tsudura_sample
 iam_instance_profile: tsudura_role
 playbook_path: "spec/samples/ansible_playbook/staging.yml"
 inventory_file: "~/.ansible/ec2.py"
-vault_password: <%= ENV["VAULT_PASSWORD"] %>
+vault_password: <%= ENV["VAULT_PASSWORD"] || 'tsudura' %>
 instance_type: t2.micro
-user_data_script: "#!/bin/bash -ex\nsu - deploy /home/deploy/startup.sh staging"
+user_data_script: >
+  #cloud-config
+
+  runcmd:
+    - su - deploy /home/deploy/startup.sh staging
 auto_scaling_group_name: tsudura-stg-blue
 owner: <%= ENV["OWNER"] %>

spec/samples/yamls/packer.yml

@@ -3,7 +3,7 @@ environment: staging
 region: ap-northeast-1
 security_group_id: sg-2f1e854a
 subnet_id: subnet-cd985794
-image_id: ami-cbf90ecb
+image_id: ami-56d4ad31
 key_name: tsudura_sample
 playbook_path: "spec/samples/ansible_playbook/staging.yml"
 inventory_file: "~/.ansible/ec2.py"

spec/samples/yamls/packer_plus.yml

@@ -3,13 +3,17 @@ environment: staging
 region: ap-northeast-1
 security_group_id: sg-2f1e854a
 subnet_id: subnet-cd985794
-image_id: ami-cbf90ecb
+image_id: ami-56d4ad31
 key_name: tsudura_sample
 iam_instance_profile: <%= ENV["IAM_INSTANCE_PROFILE"] %>
 playbook_path: "spec/samples/ansible_playbook/staging.yml"
 inventory_file: "~/.ansible/ec2.py"
 vault_password: <%= ENV["VAULT_PASSWORD"] %>
 instance_type: t2.micro
-user_data_script: "#!/bin/bash -ex\nsu - deploy /home/deploy/startup.sh staging"
+user_data_script: >
+  #cloud-config
+
+  runcmd:
+    - su - deploy /home/deploy/startup.sh staging
 owner: <%= ENV["OWNER"] %>
 mode: packer_plus

spec/samples/yamls/provisioner_test.yml

@@ -3,7 +3,7 @@ environment: staging
 region: ap-northeast-1
 security_group_id: sg-2f1e854a
 subnet_id: subnet-cd985794
-image_id: ami-cbf90ecb
+image_id: ami-56d4ad31
 key_name: tsudura_sample
 playbook_path: "spec/samples/ansible_playbook/staging.yml"
 inventory_file: "~/.ansible/ec2.py"

spec/tsudura/config_parser_spec.rb

@@ -17,13 +17,13 @@
           region: "ap-northeast-1",
           security_group_id: "sg-2f1e854a",
           subnet_id: "subnet-cd985794",
-          image_id: "ami-cbf90ecb",
+          image_id: "ami-56d4ad31",
           key_name: "tsudura_sample",
           playbook_path: "spec/samples/ansible_playbook/staging.yml",
           instance_type: "t2.micro",
           inventory_file: "~/.ansible/ec2.py",
           vault_password: "password",
-          user_data_script: "#!/bin/bash -ex\nsu - deploy /home/deploy/startup.sh staging",
+          user_data_script: "#cloud-config\nruncmd:\n  - su - deploy /home/deploy/startup.sh staging\n",
           auto_scaling_group_name: "tsudura-stg-blue",
           owner: 99999999,
           iam_instance_profile: "tsudura_role",

spec/tsudura/provisioner/ansible/command_generator_spec.rb

@@ -1,38 +1,33 @@
 require File.expand_path(File.join('../../../', 'spec_helper'), File.dirname(__FILE__))
 
 describe Tsudura::Provisioner::Ansible::CommandGenerator do
-  let(:config) { Tsudura::ConfigParser.new("#{APP_ROOT}/spec/samples/yamls/normal.yml").attributes }
-  before { ENV["VAULT_PASSWORD"] = nil }
-  after { ENV["VAULT_PASSWORD"] = nil }
+  let(:generator) { described_class.new(config) }
 
   describe "#generate" do
-    let(:generator) { described_class.new(config) }
     before { ENV["OWNER"] = "99999999" }
 
     context "vault password無し" do
+      let(:config) { Tsudura::ConfigParser.new("#{APP_ROOT}/spec/samples/yamls/has_not_vault_pass.yml").attributes }
       subject { generator.generate }
       it { should eq "ansible-playbook #{config[:playbook_path]} -i #{config[:inventory_file]}" }
     end
 
     context "vault password有り" do
-      let(:generator) { described_class.new(config) }
-      before { ENV["VAULT_PASSWORD"] = "password" }
-
+      let(:config) { Tsudura::ConfigParser.new("#{APP_ROOT}/spec/samples/yamls/normal.yml").attributes }
       subject { generator.generate }
       it { should eq "ansible-playbook #{config[:playbook_path]} -i #{config[:inventory_file]} #{generator.send :vault_password_file_option}" }
     end
   end
 
   describe "#use_vault_option?" do
-    let(:generator) { described_class.new(config) }
-
     context "vault password無し" do
+      let(:config) { Tsudura::ConfigParser.new("#{APP_ROOT}/spec/samples/yamls/has_not_vault_pass.yml").attributes }
       subject { generator.use_vault_option? }
       it { should be_falsy }
     end
 
     context "vault password有り" do
-      before { ENV["VAULT_PASSWORD"] = "password" }
+      let(:config) { Tsudura::ConfigParser.new("#{APP_ROOT}/spec/samples/yamls/normal.yml").attributes }
       subject { generator.use_vault_option? }
       it { should be_truthy }
     end