diff options
| author | Davis Phillips <davis.phillips@gmail.com> | 2017-09-07 10:14:56 -0500 |
|---|---|---|
| committer | Davis Phillips <davis.phillips@gmail.com> | 2017-09-07 10:14:56 -0500 |
| commit | 4ec2795d2978a602087d677799ddd8b9f941ee28 (patch) | |
| tree | f23cb4c061741d85bd2b1a0bf0c77e04d7378c52 /roles/openstack-stack/tasks | |
| parent | 90889d6be26eab6d6873d9063c3d8e2384ff9464 (diff) | |
| parent | 1013e6ceefc83a182f231ab7d178676e4d996ceb (diff) | |
| download | openshift-4ec2795d2978a602087d677799ddd8b9f941ee28.tar.gz openshift-4ec2795d2978a602087d677799ddd8b9f941ee28.tar.bz2 openshift-4ec2795d2978a602087d677799ddd8b9f941ee28.tar.xz openshift-4ec2795d2978a602087d677799ddd8b9f941ee28.zip | |
updating rhsm-sub and rhsm-repos
Diffstat (limited to 'roles/openstack-stack/tasks')
| -rw-r--r-- | roles/openstack-stack/tasks/main.yml | 9 | ||||
| -rw-r--r-- | roles/openstack-stack/tasks/subnet_update_dns_servers.yaml | 1 |
2 files changed, 8 insertions, 2 deletions
diff --git a/roles/openstack-stack/tasks/main.yml b/roles/openstack-stack/tasks/main.yml index a53e6350b..9b4855294 100644 --- a/roles/openstack-stack/tasks/main.yml +++ b/roles/openstack-stack/tasks/main.yml @@ -8,7 +8,6 @@ - name: set template paths set_fact: stack_template_path: "{{ stack_template_pre.path }}/stack.yaml" - server_template_path: "{{ stack_template_pre.path }}/server.yaml" user_data_template_path: "{{ stack_template_pre.path }}/user-data" - name: generate HOT stack template from jinja2 template @@ -19,7 +18,13 @@ - name: generate HOT server template from jinja2 template template: src: heat_stack_server.yaml.j2 - dest: "{{ server_template_path }}" + dest: "{{ stack_template_pre.path }}/server.yaml" + +- name: generate HOT server w/o floating IPs template from jinja2 template + template: + src: heat_stack_server_nofloating.yaml.j2 + dest: "{{ stack_template_pre.path }}/server_nofloating.yaml" + when: use_bastion|bool - name: generate user_data from jinja2 template template: diff --git a/roles/openstack-stack/tasks/subnet_update_dns_servers.yaml b/roles/openstack-stack/tasks/subnet_update_dns_servers.yaml index be4f07b97..af28fc98f 100644 --- a/roles/openstack-stack/tasks/subnet_update_dns_servers.yaml +++ b/roles/openstack-stack/tasks/subnet_update_dns_servers.yaml @@ -6,3 +6,4 @@ state: present use_default_subnetpool: yes dns_nameservers: "{{ [private_dns_server|default(public_dns_nameservers[0])]|union(public_dns_nameservers)|unique }}" + when: not provider_network |