openstack
/
tripleo-quickstart-extras
Code Issues Proposed changes

Merge "Always create network-environment for deployed-server"

This commit is contained in:
Jenkins 2017-06-21 15:06:15 +00:00 committed by Gerrit Code Review
parent d343e59744 0c372ebb2b
commit fe8fdde3f9
3 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
roles/extras-common/defaults/main.yml
View File

@ -2,6 +2,7 @@
overcloud_ipv6: false
containerized_overcloud: false
deployed_server: false
containerized_overcloud_upgrade: false
overcloud_templates_path: /usr/share/openstack-tripleo-heat-templates
enable_tls_everywhere: false

1
roles/overcloud-deploy/defaults/main.yml
View File

@ -83,7 +83,6 @@ enable_swap: false
swap_type: "file"
swap_args: ""
deployed_server: false
deployed_server_prepare_script: deployed_server_prepare.sh.j2
deployed_server_prepare_log: "{{ working_dir }}/deployed_server_prepare.txt"

2
roles/overcloud-prep-config/tasks/main.yml
View File

@ -17,7 +17,7 @@
src: "{{ network_environment_file }}"
dest: "{{ working_dir }}/network-environment.yaml"
mode: 0644
when: network_isolation|bool and undercloud_type != "baremetal"
when: network_isolation|bool and undercloud_type != "baremetal" or deployed_server|bool
- when: undercloud_type == "baremetal"
block: