Remove deprecated nginx_port option

The nginx_port variable was deprecated a long time ago,
removing support for it.

Change-Id: Ic08196b334d4868c702c887752930e3b12ec0252
This commit is contained in:
Julia Kreger 2017-02-03 20:00:25 +00:00
parent 1e5db8127e
commit 410176d0f5
4 changed files with 3 additions and 15 deletions

View File

@ -1,9 +1,7 @@
--- ---
# defaults file for bifrost-deploy-nodes-dynamic # defaults file for bifrost-deploy-nodes-dynamic
ironic_url: "http://localhost:6385/" ironic_url: "http://localhost:6385/"
# Deprecated: nginx_port is no longer used and file_url_port should file_url_port: "8080"
# be used instead.
file_url_port: "{{ nginx_port | default('8080') }}"
network_interface: "virbr0" network_interface: "virbr0"
ans_network_interface: "{{ network_interface | replace('-', '_') }}" ans_network_interface: "{{ network_interface | replace('-', '_') }}"
http_boot_folder: "/httpboot" http_boot_folder: "/httpboot"

View File

@ -4,9 +4,7 @@
cleaning: false cleaning: false
http_boot_folder: /httpboot http_boot_folder: /httpboot
staging_drivers_include: false staging_drivers_include: false
# Deprecated: nginx_port is no longer used and file_url_port should file_url_port: "8080"
# be used instead.
file_url_port: "{{ nginx_port | default('8080') }}"
ironicclient_source_install: false ironicclient_source_install: false
shade_source_install: true shade_source_install: true
ironicinspector_source_install: false ironicinspector_source_install: false

View File

@ -22,12 +22,6 @@
noauth_mode | bool == true and enable_keystone is defined and noauth_mode | bool == true and enable_keystone is defined and
enable_keystone | bool == true enable_keystone | bool == true
- name: "Warn if deprecated variable nginx_port is set"
debug:
msg: >
WARNING - nginx_port is a deprecated variable and support will be
removed during the Newton cycle.
when: nginx_port is defined
- name: "If VENV is set in the environment, enable installation into venv" - name: "If VENV is set in the environment, enable installation into venv"
set_fact: set_fact:
enable_venv: true enable_venv: true

View File

@ -1,8 +1,6 @@
--- ---
ironic_url: "http://localhost:6385/" ironic_url: "http://localhost:6385/"
# Deprecated: nginx_port is no longer used and file_url_port should file_url_port: "8080"
# be used instead.
file_url_port: "{{ nginx_port | default('8080') }}"
# Default network interface that bifrost will be attached to. # Default network interface that bifrost will be attached to.
network_interface: "virbr0" network_interface: "virbr0"
ans_network_interface: "{{ network_interface | replace('-', '_') }}" ans_network_interface: "{{ network_interface | replace('-', '_') }}"