Fix bug in sfc_user variables file for pike

Change-Id: I6cd9a6fd2b3688ae784b724cedd63094e5bc6f5d
Signed-off-by: Manuel Buil <mbuil@suse.com>

4 files changed, 4 insertions, 19 deletions

diff --git a/scenarios/os-odl-sfc/role/os-odl-sfc/files/ha/user_sfc_scenarios_variables.yml b/scenarios/os-odl-sfc/role/os-odl-sfc/files/ha/user_sfc_scenarios_variables_pike.yml
index f4fd5dc5..002db2b1 100644
--- a/scenarios/os-odl-sfc/role/os-odl-sfc/files/ha/user_sfc_scenarios_variables.yml
+++ b/scenarios/os-odl-sfc/role/os-odl-sfc/files/ha/user_sfc_scenarios_variables_pike.yml
@@ -21,8 +21,8 @@
 # # Debug and Verbose options.
 debug: false
 
-haproxy_keepalived_external_vip_cidr: "192.168.122.3/32"
-haproxy_keepalived_internal_vip_cidr: "172.29.236.11/32"
+haproxy_keepalived_external_vip_cidr: "192.168.122.220/32"
+haproxy_keepalived_internal_vip_cidr: "172.29.236.222/32"
 haproxy_keepalived_external_interface: br-vlan
 haproxy_keepalived_internal_interface: br-mgmt
 gnocchi_db_sync_options: ""
@@ -43,7 +43,7 @@ neutron_opendaylight_conf_ini_overrides:
     username: "admin"
     password: "admin"
     port_binding_controller: "pseudo-agentdb-binding"
-    url: "http://{{ hostvars[groups['neutron_server'][0]]['ansible_eth1']['ipv4']['address'] }}:8080/controller/nb/v2/neutron"
+    url: "http://{{ internal_lb_vip_address }}:8080/controller/nb/v2/neutron"
 neutron_plugin_base:
   - odl-router_v2
   - metering
@@ -101,8 +101,3 @@ provider_networks:
         - cinder_api
         - cinder_volume
         - nova_compute
-
-openstack_host_specific_kernel_modules:
-  - name: openvswitch
-
-openstack_host_metal_distro_packages: "{{ ovs_nsh_required_metal_packages + _openstack_host_metal_distro_packages }}"
diff --git a/scenarios/os-odl-sfc/role/os-odl-sfc/files/mini/user_sfc_scenarios_variables.yml b/scenarios/os-odl-sfc/role/os-odl-sfc/files/mini/user_sfc_scenarios_variables_pike.yml
index ed4c047e..4ee48807 100644
--- a/scenarios/os-odl-sfc/role/os-odl-sfc/files/mini/user_sfc_scenarios_variables.yml
+++ b/scenarios/os-odl-sfc/role/os-odl-sfc/files/mini/user_sfc_scenarios_variables_pike.yml
@@ -100,8 +100,3 @@ provider_networks:
         - cinder_api
         - cinder_volume
         - nova_compute
-
-openstack_host_specific_kernel_modules:
-  - name: openvswitch
-
-openstack_host_metal_distro_packages: "{{ ovs_nsh_required_metal_packages + _openstack_host_metal_distro_packages }}"
diff --git a/scenarios/os-odl-sfc/role/os-odl-sfc/files/noha/user_sfc_scenarios_variables.yml b/scenarios/os-odl-sfc/role/os-odl-sfc/files/noha/user_sfc_scenarios_variables_pike.yml
index ed4c047e..4ee48807 100644
--- a/scenarios/os-odl-sfc/role/os-odl-sfc/files/noha/user_sfc_scenarios_variables.yml
+++ b/scenarios/os-odl-sfc/role/os-odl-sfc/files/noha/user_sfc_scenarios_variables_pike.yml
@@ -100,8 +100,3 @@ provider_networks:
         - cinder_api
         - cinder_volume
         - nova_compute
-
-openstack_host_specific_kernel_modules:
-  - name: openvswitch
-
-openstack_host_metal_distro_packages: "{{ ovs_nsh_required_metal_packages + _openstack_host_metal_distro_packages }}"
diff --git a/scenarios/os-odl-sfc/role/os-odl-sfc/tasks/copy-OSA-files-pike.yml b/scenarios/os-odl-sfc/role/os-odl-sfc/tasks/copy-OSA-files-pike.yml
index 16e07005..5459dfed 100644
--- a/scenarios/os-odl-sfc/role/os-odl-sfc/tasks/copy-OSA-files-pike.yml
+++ b/scenarios/os-odl-sfc/role/os-odl-sfc/tasks/copy-OSA-files-pike.yml
@@ -3,7 +3,7 @@
 
 - name: copy user_sfc_scenarios_variables.yml
   copy:
-    src: "{{XCI_FLAVOR}}/user_sfc_scenarios_variables.yml"
+    src: "{{XCI_FLAVOR}}/user_sfc_scenarios_variables_pike.yml"
     dest: "{{OPENSTACK_OSA_ETC_PATH}}/user_sfc_scenarios_variables.yml"
 
 - name: copy OPNFV role requirements