Use bootstrap_host_scenarios_expanded for services

bootstrap_host_scenarios_expanded contains final version of service scenarios
so to be consistent about where we look for the services scenario,
it's used across integrated role.

Change-Id: I0ceb2ebcee6ddf4c37a8b9eb841b4865dcfd6fda

tests/roles/bootstrap-host/tasks/main.yml

@@ -150,7 +150,7 @@
 # Prepare local squid proxy
 - include: prepare_squid.yml
   when:
-    - "bootstrap_host_scenario is search('proxy')"
+    - "'proxy' in bootstrap_host_scenarios_expanded"
   tags:
     - prepare-squid
 

tests/roles/bootstrap-host/tasks/prepare_aio_config.yml

@@ -172,7 +172,7 @@
       condition: "{{ 'congress' in bootstrap_host_scenarios_expanded }}"
     - src: user_variables_translations.yml.j2
       dest: user_variables_translations.yml
-      condition: "{{ bootstrap_host_scenario is search('translations') }}"
+      condition: "{{ 'translations' in bootstrap_host_scenarios_expanded }}"
     - src: user_variables_barbican.yml.j2
       dest: user_variables_barbican.yml
       condition: "{{ 'barbican' in bootstrap_host_scenarios_expanded }}"
@@ -195,7 +195,7 @@
     src: "{{ playbook_dir }}/../etc/openstack_deploy/env.d/calico.yml.example"
     dest: "/etc/openstack_deploy/env.d/calico.yml"
   when:
-    - "'calico' in bootstrap_host_scenarios"
+    - "'calico' in bootstrap_host_scenarios_expanded"
 
 - name: Create vars override folders if we need to test them
   file:

tests/roles/bootstrap-host/templates/user_variables.aio.yml.j2

@@ -40,7 +40,7 @@ galera_wsrep_provider_options:
 ## Repo
 repo_nginx_threads: 2
 
-{% if 'metal' in bootstrap_host_scenario %}
+{% if 'metal' in bootstrap_host_scenarios %}
 # NOTE(mnaser): We don't currently deploy HAproxy in metal scenarios therefore
 #               all URLs which be using HTTP instead of HTTPS.
 openstack_service_publicuri_proto: http
@@ -166,7 +166,7 @@ trove_wsgi_processes_max: 2
 trove_wsgi_processes: 1
 
 ## Octavia
-{% if 'metal' in bootstrap_host_scenario %}
+{% if 'metal' in bootstrap_host_scenarios %}
 # TODO(mnaser): The Octavia role relies on gathering IPs of hosts in the
 #               LBaaS network and using those in the health manager pool
 #               IPs.  We don't store those IPs when running metal so we
@@ -238,7 +238,7 @@ openstack_user_kernel_options:
   - key: 'kernel.printk'
     value: '4 1 7 4'
 
-{% if 'octavia' in bootstrap_host_scenario %}
+{% if 'octavia' in bootstrap_host_scenarios_expanded %}
 # Enable Octavia V2 API/standalone
 octavia_v2: True
 # Disable Octavia V1 API
@@ -247,7 +247,7 @@ octavia_management_net_subnet_cidr: "{{ (bootstrap_host_container_tech == 'nspaw
 tempest_run_concurrency: 0
 {% endif %}
 
-{% if bootstrap_host_scenario is search('proxy') %}
+{% if 'proxy' in bootstrap_host_scenarios_expanded %}
 # For testing with the 'proxy' scenario configure deployment environment
 # to point to the local squid
 # Playbooks will set a runtime proxy to the AIO host squid