From ad24dc3e8611bb115194d45f8e87f8883f2fe594 Mon Sep 17 00:00:00 2001 From: "Mark T. Voelker" Date: Fri, 14 Oct 2016 12:00:22 -0400 Subject: [PATCH] Make lampstack work in config drive environments Currently, the lampstack workload assumes that either you're using the nova metadata service or that config drive is enabled globally in your nova.conf file: there's no option to enable it on a per-environment basis. This patch adds the ability to specify whether config_drive should be used or not in the app_env variables, with a default value set to "no" (which means that the new variable isn't required and that if a user doesn't set it, he or she will get the same behavior as before this patch). Change-Id: I717bf5a37f98da79141af70df90feb7fd7b3f8c7 --- ansible/lampstack/README.md | 1 + ansible/lampstack/roles/apply/tasks/main.yml | 3 +++ 2 files changed, 4 insertions(+) diff --git a/ansible/lampstack/README.md b/ansible/lampstack/README.md index a583823..411bd6a 100755 --- a/ansible/lampstack/README.md +++ b/ansible/lampstack/README.md @@ -63,6 +63,7 @@ You may create one such file per cloud for your tests. stack_size: 4, volume_size: 2, block_device_name: "/dev/vdb", + config_drive: no, wp_theme: "https://downloads.wordpress.org/theme/iribbon.2.0.65.zip", wp_posts: "http://wpcandy.s3.amazonaws.com/resources/postsxml.zip" } diff --git a/ansible/lampstack/roles/apply/tasks/main.yml b/ansible/lampstack/roles/apply/tasks/main.yml index 185826d..afc4144 100755 --- a/ansible/lampstack/roles/apply/tasks/main.yml +++ b/ansible/lampstack/roles/apply/tasks/main.yml @@ -78,6 +78,7 @@ network: "{{ app_env.private_net_name }}" auto_ip: yes userdata: "{{ lookup('file', 'templates/userdata.j2') }}" + config_drive: "{{ app_env.config_drive | default('no') }}" security_groups: lampstack_sg meta: hostname: database @@ -110,6 +111,7 @@ network: "{{ app_env.private_net_name }}" auto_ip: yes userdata: "{{ lookup('file', 'templates/userdata.j2') }}" + config_drive: "{{ app_env.config_drive | default('no') }}" security_groups: lampstack_sg meta: hostname: balancer @@ -153,6 +155,7 @@ network: "{{ app_env.private_net_name }}" auto_ip: yes userdata: "{{ lookup('file', 'templates/userdata.j2') }}" + config_drive: "{{ app_env.config_drive | default('no') }}" security_groups: lampstack_sg meta: hostname: apache-{{ item }}