x
/
osops-tools-contrib
Code Issues Proposed changes

Merge "Make lampstack work in config drive environments"

This commit is contained in:
Jenkins 2016-10-17 20:02:18 +00:00 committed by Gerrit Code Review
parent bf6ac2f618 ad24dc3e86
commit 7d1e03e140
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ansible/lampstack/README.md
View File

@ -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"
}

3
ansible/lampstack/roles/apply/tasks/main.yml
View File

@ -77,6 +77,7 @@
flavor: "{{ openstack_flavors[0].id }}"
network: "{{ app_env.private_net_name }}"
userdata: "{{ lookup('file', 'templates/userdata.j2') }}"
config_drive: "{{ app_env.config_drive | default('no') }}"
security_groups: lampstack_sg
floating_ip_pools: "{{ app_env.public_net_name | default(omit) }}"
meta:
@ -109,6 +110,7 @@
flavor: "{{ openstack_flavors[0].id }}"
network: "{{ app_env.private_net_name }}"
userdata: "{{ lookup('file', 'templates/userdata.j2') }}"
config_drive: "{{ app_env.config_drive | default('no') }}"
security_groups: lampstack_sg
floating_ip_pools: "{{ app_env.public_net_name | default(omit) }}"
meta:
@ -153,6 +155,7 @@
network: "{{ app_env.private_net_name }}"
floating_ip_pools: "{{ app_env.public_net_name | default(omit) }}"
userdata: "{{ lookup('file', 'templates/userdata.j2') }}"
config_drive: "{{ app_env.config_drive | default('no') }}"
security_groups: lampstack_sg
meta:
hostname: apache-{{ item }}