From 073b3b2a90aca8c4bde076dfe427ca4d13f5d3ae Mon Sep 17 00:00:00 2001 From: ZhongShengping Date: Mon, 27 Nov 2017 15:31:05 +0800 Subject: [PATCH] Remove use_neutron option Nova network has been fully removed from the OpenStack codebase. As such, all instances of switches on use_neutron should be removed, as the functionality will never be meaningful. Change-Id: I2eb338ba53d51c62c88bbbfd145462030596da74 Depends-On: Ib9d87dd339d637b69fb27315d92228cbc523c8eb Closes-Bug: #1734615 --- defaults/main.yml | 1 - releasenotes/notes/remove_use_neutron-76135a385ef1345d.yaml | 3 +++ templates/sahara.conf.j2 | 1 - 3 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 releasenotes/notes/remove_use_neutron-76135a385ef1345d.yaml diff --git a/defaults/main.yml b/defaults/main.yml index 92fa1aa..f7f7bba 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -102,7 +102,6 @@ sahara_keystone_auth_plugin: password ## Sahara config sahara_use_floating_ips: False -sahara_use_neutron: True sahara_use_namespaces: False sahara_global_remote_threshold: 100 sahara_cluster_remote_threshold: 70 diff --git a/releasenotes/notes/remove_use_neutron-76135a385ef1345d.yaml b/releasenotes/notes/remove_use_neutron-76135a385ef1345d.yaml new file mode 100644 index 0000000..51f8289 --- /dev/null +++ b/releasenotes/notes/remove_use_neutron-76135a385ef1345d.yaml @@ -0,0 +1,3 @@ +--- +other: + - The use_neutron option was marked to be removed in sahara. diff --git a/templates/sahara.conf.j2 b/templates/sahara.conf.j2 index 7d66146..78e8195 100644 --- a/templates/sahara.conf.j2 +++ b/templates/sahara.conf.j2 @@ -11,7 +11,6 @@ host = {{ sahara_api_bind_address }} port = {{ sahara_api_service_port }} workers = {{ sahara_api_workers }} use_floating_ips = {{ sahara_use_floating_ips }} -use_neutron = {{ sahara_use_neutron }} use_namespaces = {{ sahara_use_namespaces }} plugins = {{ sahara_plugin_loaded_base }} global_remote_threshold = {{ sahara_global_remote_threshold }}