From 410176d0f56dca580133957af8c83532df6cf59c Mon Sep 17 00:00:00 2001 From: Julia Kreger Date: Fri, 3 Feb 2017 20:00:25 +0000 Subject: [PATCH] Remove deprecated nginx_port option The nginx_port variable was deprecated a long time ago, removing support for it. Change-Id: Ic08196b334d4868c702c887752930e3b12ec0252 --- .../roles/bifrost-deploy-nodes-dynamic/defaults/main.yml | 4 +--- playbooks/roles/bifrost-ironic-install/defaults/main.yml | 4 +--- playbooks/roles/bifrost-ironic-install/tasks/bootstrap.yml | 6 ------ playbooks/roles/ironic-enroll-dynamic/defaults/main.yml | 4 +--- 4 files changed, 3 insertions(+), 15 deletions(-) diff --git a/playbooks/roles/bifrost-deploy-nodes-dynamic/defaults/main.yml b/playbooks/roles/bifrost-deploy-nodes-dynamic/defaults/main.yml index 9dc66eddf..a2422d74e 100644 --- a/playbooks/roles/bifrost-deploy-nodes-dynamic/defaults/main.yml +++ b/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 -# be used instead. -file_url_port: "{{ nginx_port | default('8080') }}" +file_url_port: "8080" network_interface: "virbr0" ans_network_interface: "{{ network_interface | replace('-', '_') }}" http_boot_folder: "/httpboot" diff --git a/playbooks/roles/bifrost-ironic-install/defaults/main.yml b/playbooks/roles/bifrost-ironic-install/defaults/main.yml index 8646851b6..d29b95a14 100644 --- a/playbooks/roles/bifrost-ironic-install/defaults/main.yml +++ b/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 -# be used instead. -file_url_port: "{{ nginx_port | default('8080') }}" +file_url_port: "8080" ironicclient_source_install: false shade_source_install: true ironicinspector_source_install: false diff --git a/playbooks/roles/bifrost-ironic-install/tasks/bootstrap.yml b/playbooks/roles/bifrost-ironic-install/tasks/bootstrap.yml index e5299fccc..e682577d1 100644 --- a/playbooks/roles/bifrost-ironic-install/tasks/bootstrap.yml +++ b/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 diff --git a/playbooks/roles/ironic-enroll-dynamic/defaults/main.yml b/playbooks/roles/ironic-enroll-dynamic/defaults/main.yml index 467149d3e..51acc7f6f 100644 --- a/playbooks/roles/ironic-enroll-dynamic/defaults/main.yml +++ b/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 -# be used instead. -file_url_port: "{{ nginx_port | default('8080') }}" +file_url_port: "8080" # Default network interface that bifrost will be attached to. network_interface: "virbr0" ans_network_interface: "{{ network_interface | replace('-', '_') }}"