Merge "Remove deprecated nginx_port option"

playbooks/roles/bifrost-deploy-nodes-dynamic/defaults/main.yml

@@ -1,9 +1,7 @@
 ---
 # defaults file for bifrost-deploy-nodes-dynamic
 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"
 ans_network_interface: "{{ network_interface | replace('-', '_') }}"
 http_boot_folder: "/httpboot"

playbooks/roles/bifrost-ironic-install/defaults/main.yml

@@ -4,9 +4,7 @@
 cleaning: false
 http_boot_folder: /httpboot
 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
 shade_source_install: true
 ironicinspector_source_install: false

playbooks/roles/bifrost-ironic-install/tasks/bootstrap.yml

@@ -22,12 +22,6 @@
     noauth_mode | bool == true and enable_keystone is defined and
     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"
   set_fact:
     enable_venv: true

playbooks/roles/ironic-enroll-dynamic/defaults/main.yml

@@ -1,8 +1,6 @@
 ---
 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.
 network_interface: "virbr0"
 ans_network_interface: "{{ network_interface | replace('-', '_') }}"