CORD-2459 Combine profile variables into genconfig/config.yml
Change-Id: I8def60a76e051f4545e2460dcc36e640f9ed41aa
diff --git a/add-bootstrap-containers-playbook.yml b/add-bootstrap-containers-playbook.yml
index 24cf255..620755c 100644
--- a/add-bootstrap-containers-playbook.yml
+++ b/add-bootstrap-containers-playbook.yml
@@ -22,12 +22,3 @@
roles:
- xos-bootstrap-hosts
-- name: Re-include vars after adding bootstrap containers
- hosts: xos_bootstrap_ui
- tasks:
- - name: Include variables
- include_vars: "{{ item }}"
- with_items:
- - "profile_manifests/{{ cord_profile }}.yml"
- - profile_manifests/local_vars.yml
-
diff --git a/add-onboard-containers-playbook.yml b/add-onboard-containers-playbook.yml
index de1d852..0d95e19 100644
--- a/add-onboard-containers-playbook.yml
+++ b/add-onboard-containers-playbook.yml
@@ -21,13 +21,3 @@
hosts: head
roles:
- xos-onboard-hosts
-
-- name: Re-include vars after adding onboarded containers
- hosts: xos_ui
- tasks:
- - name: Include variables
- include_vars: "{{ item }}"
- with_items:
- - "profile_manifests/{{ cord_profile }}.yml"
- - profile_manifests/local_vars.yml
-
diff --git a/build-core-image-playbook.yml b/build-core-image-playbook.yml
index 50fd4dc..3d7f29c 100644
--- a/build-core-image-playbook.yml
+++ b/build-core-image-playbook.yml
@@ -17,15 +17,6 @@
---
# build-core-image-playbook.yml
-- name: Include vars
- hosts: build
- tasks:
- - name: Include variables
- include_vars: "{{ item }}"
- with_items:
- - "profile_manifests/{{ cord_profile }}.yml"
- - profile_manifests/local_vars.yml
-
- name: Build the XOS core image
hosts: build
roles:
diff --git a/compute-node-refresh-playbook.yml b/compute-node-refresh-playbook.yml
index ce9dafd..78ab31b 100644
--- a/compute-node-refresh-playbook.yml
+++ b/compute-node-refresh-playbook.yml
@@ -21,15 +21,6 @@
# On physical/CiaB w/MaaS:
# ansible-playbook -i /etc/maas/ansible/pod-inventory --extra-vars=@/opt/cord/build/genconfig/config.yml compute-node-refresh-playbook.yml
-- name: Include vars
- hosts: all
- tasks:
- - name: Include variables
- include_vars: "{{ item }}"
- with_items:
- - "profile_manifests/{{ cord_profile }}.yml"
- - profile_manifests/local_vars.yml
-
- name: Recreate compute node configuration
hosts: head
roles:
diff --git a/copy-cord-playbook.yml b/copy-cord-playbook.yml
index 5fc1955..405ed86 100644
--- a/copy-cord-playbook.yml
+++ b/copy-cord-playbook.yml
@@ -17,15 +17,6 @@
# copy-cord-playbook.yml
# Copy the cord directory from config node to head node
-- name: Include vars
- hosts: head
- tasks:
- - name: Include variables
- include_vars: "{{ item }}"
- with_items:
- - "profile_manifests/{{ cord_profile }}.yml"
- - profile_manifests/local_vars.yml
-
- name: Copy cord directory structure to head node
hosts: head
roles:
diff --git a/copy-profile-playbook.yml b/copy-profile-playbook.yml
index a093527..87d2afc 100644
--- a/copy-profile-playbook.yml
+++ b/copy-profile-playbook.yml
@@ -16,15 +16,6 @@
# copy-profile-playbook.yml
# Copies the profile to the head node
-- name: Include vars
- hosts: head, config
- tasks:
- - name: Include variables
- include_vars: "{{ item }}"
- with_items:
- - "profile_manifests/{{ cord_profile }}.yml"
- - profile_manifests/local_vars.yml
-
- name: Copy cord_profile to head node from config node
hosts: head
roles:
diff --git a/cord-automation-playbook.yml b/cord-automation-playbook.yml
index 60d462e..0a5a1df 100644
--- a/cord-automation-playbook.yml
+++ b/cord-automation-playbook.yml
@@ -18,15 +18,6 @@
# cord-automation-playbook.yml
# Installs the automation scripts used by MaaS to provision nodes.
-- name: Include vars
- hosts: all
- tasks:
- - name: Include variables
- include_vars: "{{ item }}"
- with_items:
- - "profile_manifests/{{ cord_profile }}.yml"
- - profile_manifests/local_vars.yml
-
- name: Set up Automated Compute Node Provisioning
hosts: head
roles:
diff --git a/cord-compute-maas-playbook.yml b/cord-compute-maas-playbook.yml
index b30a1ef..468fe07 100644
--- a/cord-compute-maas-playbook.yml
+++ b/cord-compute-maas-playbook.yml
@@ -18,15 +18,6 @@
# cord-compute-maas-playbook.yml
# Installs and configures compute nodes when using MaaS
-- name: Include vars
- hosts: all
- tasks:
- - name: Include variables
- include_vars: "{{ item }}"
- with_items:
- - "profile_manifests/{{ cord_profile }}.yml"
- - profile_manifests/local_vars.yml
-
- include: prep-computenode-playbook.yml
- include: deploy-computenode-playbook.yml
diff --git a/cord-config-playbook.yml b/cord-config-playbook.yml
index a7fcd5a..70da634 100644
--- a/cord-config-playbook.yml
+++ b/cord-config-playbook.yml
@@ -17,15 +17,6 @@
# cord-config-playbook.yml
# Creates all configuration for a CORD pod
-- name: Include vars
- hosts: config
- tasks:
- - name: Include variables
- include_vars: "{{ item }}"
- with_items:
- - "profile_manifests/{{ cord_profile }}.yml"
- - profile_manifests/local_vars.yml
-
- name: Create SSL Root CA, Intermediate CA, Server certs, SSH CA and keypairs
hosts: config
roles:
diff --git a/cord-refresh-fabric.yml b/cord-refresh-fabric.yml
index a86717b..a71ed88 100644
--- a/cord-refresh-fabric.yml
+++ b/cord-refresh-fabric.yml
@@ -18,15 +18,6 @@
# Creates a fabric configuration using 'cord generate'
# Mainly useful for CiaB right now
-- name: Include vars
- hosts: head
- tasks:
- - name: Include variables
- include_vars: "{{ item }}"
- with_items:
- - "profile_manifests/{{ cord_profile }}.yml"
- - profile_manifests/local_vars.yml
-
- name: Prep fabric on head node
hosts: head
roles:
diff --git a/deploy-computenode-playbook.yml b/deploy-computenode-playbook.yml
index 9f61f0b..217d7a0 100644
--- a/deploy-computenode-playbook.yml
+++ b/deploy-computenode-playbook.yml
@@ -18,15 +18,6 @@
# deploy-computenode-playbook.yml
# deploys compute nodes with Juju, creates config
-- name: Include vars
- hosts: all
- tasks:
- - name: Include variables
- include_vars: "{{ item }}"
- with_items:
- - "profile_manifests/{{ cord_profile }}.yml"
- - profile_manifests/local_vars.yml
-
- name: Deploy compute nodes, create configuration
hosts: head
roles:
diff --git a/deploy-mavenrepo-playbook.yml b/deploy-mavenrepo-playbook.yml
index 712c21e..9dc4a94 100644
--- a/deploy-mavenrepo-playbook.yml
+++ b/deploy-mavenrepo-playbook.yml
@@ -18,15 +18,6 @@
# deploy-mavenrepo-playbook.yml
# Deploys mavenrepo in Docker container on the CORD head node
-- name: Include vars
- hosts: head
- tasks:
- - name: Include variables
- include_vars: "{{ item }}"
- with_items:
- - "profile_manifests/{{ cord_profile }}.yml"
- - profile_manifests/local_vars.yml
-
- name: Deploy and start mavenrepo
hosts: head
roles:
diff --git a/deploy-onos-playbook.yml b/deploy-onos-playbook.yml
index 8e635b4..6e632b9 100644
--- a/deploy-onos-playbook.yml
+++ b/deploy-onos-playbook.yml
@@ -18,15 +18,6 @@
# deploy-onos-playbook.yml
# Deploys ONOS in Docker containers on the CORD head node
-- name: Include vars
- hosts: head
- tasks:
- - name: Include variables
- include_vars: "{{ item }}"
- with_items:
- - "profile_manifests/{{ cord_profile }}.yml"
- - profile_manifests/local_vars.yml
-
- name: Deploy and start ONOS containers
hosts: head
roles:
diff --git a/deploy-openstack-playbook.yml b/deploy-openstack-playbook.yml
index a806147..d66741a 100644
--- a/deploy-openstack-playbook.yml
+++ b/deploy-openstack-playbook.yml
@@ -18,15 +18,6 @@
# deploy-openstack-playbook.yml
# Deploys OpenStack in LXD containers on the CORD head node
-- name: Include vars
- hosts: all
- tasks:
- - name: Include variables
- include_vars: "{{ item }}"
- with_items:
- - "profile_manifests/{{ cord_profile }}.yml"
- - profile_manifests/local_vars.yml
-
- name: Create LXD containers
hosts: head
become: yes
diff --git a/ecord-test-subscriber-playbook.yml b/ecord-test-subscriber-playbook.yml
index df709cb..5b7372d 100644
--- a/ecord-test-subscriber-playbook.yml
+++ b/ecord-test-subscriber-playbook.yml
@@ -18,15 +18,6 @@
# pod-test-playbook.yml
# Tests CiaB cord-pod XOS configuration
-- name: Include vars
- hosts: all
- tasks:
- - name: Include variables
- include_vars: "{{ item }}"
- with_items:
- - "profile_manifests/{{ cord_profile }}.yml"
- - profile_manifests/local_vars.yml
-
- name: Create test subscriber
hosts: head
roles:
diff --git a/glance-images-playbook.yml b/glance-images-playbook.yml
index f07cfd0..7d1f857 100644
--- a/glance-images-playbook.yml
+++ b/glance-images-playbook.yml
@@ -18,15 +18,6 @@
# glance-images-playbook.yml
# Downloads glance images required by profile
-- name: Include vars
- hosts: head
- tasks:
- - name: Include variables
- include_vars: "{{ item }}"
- with_items:
- - "profile_manifests/{{ cord_profile }}.yml"
- - profile_manifests/local_vars.yml
-
- name: Download images for Glance
hosts: head
roles:
diff --git a/instantiate-monitoringservice-playbook.yml b/instantiate-monitoringservice-playbook.yml
index 9e9c657..66c122f 100644
--- a/instantiate-monitoringservice-playbook.yml
+++ b/instantiate-monitoringservice-playbook.yml
@@ -22,15 +22,6 @@
# eventually fail. Until it is fixed, once monitoring service synchronizer is ready, run this
# ansible playbook which has only tasks for instantiating the monitoring service models.
-- name: Include vars
- hosts: all
- tasks:
- - name: Include variables
- include_vars: "{{ item }}"
- with_items:
- - "profile_manifests/{{ cord_profile }}.yml"
- - profile_manifests/local_vars.yml
-
- name: Create monitoringservice config
hosts: head
roles:
diff --git a/mcord-ng40-test-playbook.yml b/mcord-ng40-test-playbook.yml
index 7505db0..2f906a3 100644
--- a/mcord-ng40-test-playbook.yml
+++ b/mcord-ng40-test-playbook.yml
@@ -18,17 +18,6 @@
# mcord-ng40-test-playbook.yml
# Tests CiaB cord-pod XOS configuration
-- name: Include vars
- hosts: all
- tasks:
- - name: Include variables
- include_vars: "{{ item }}"
- with_items:
- - "profile_manifests/{{ cord_profile }}.yml"
- - profile_manifests/local_vars.yml
-
-
-
- name: Run base M-CORD tests
hosts: head
become: no
diff --git a/mcord-spirent-test-playbook.yml b/mcord-spirent-test-playbook.yml
deleted file mode 100644
index a80a61f..0000000
--- a/mcord-spirent-test-playbook.yml
+++ /dev/null
@@ -1,58 +0,0 @@
-
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
----
-# mcord-spirent-test-playbook.yml
-# Tests CiaB cord-pod XOS configuration
-
-- name: Include vars
- hosts: all
- tasks:
- - name: Include variables
- include_vars: "{{ item }}"
- with_items:
- - "profile_manifests/{{ cord_profile }}.yml"
- - profile_manifests/local_vars.yml
-
-- name: Run base M-CORD tests
- hosts: head
- become: no
- # These variables could be elevated to the profile. Think about
- # doing this after the E2E test framework is complete.
- vars:
- test_networks:
- - management
- - sgi_network
- - s11_network
- - spgw_network
- test_services:
- - venb
- - vspgwc
- - vspgwu
- test_ports:
- - { vm: venb, network: management }
- - { vm: venb, network: s11_network }
- - { vm: venb, network: sgi_network }
- - { vm: venb, network: s1u_network }
- - { vm: vspgwc, network: management }
- - { vm: vspgwc, network: s11_network }
- - { vm: vspgwc, network: spgw_network }
- - { vm: vspgwu, network: management }
- - { vm: vspgwu, network: s1u_network }
- - { vm: vspgwu, network: sgi_network }
- - { vm: vspgwu, network: spgw_network }
- roles:
- - test-mcord-base
diff --git a/mcord-test-playbook.yml b/mcord-test-playbook.yml
deleted file mode 100644
index 0d58dcd..0000000
--- a/mcord-test-playbook.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
----
-# mcord-test-playbook.yml
-# Tests CiaB cord-pod XOS configuration
-
-- name: Include vars
- hosts: all
- tasks:
- - name: Include variables
- include_vars: "{{ item }}"
- with_items:
- - "profile_manifests/{{ cord_profile }}.yml"
- - profile_manifests/local_vars.yml
-
-- name: Run base M-CORD tests
- hosts: head
- become: no
- roles:
- - test-mcord-base
diff --git a/mock-ecord-container-test.yml b/mock-ecord-container-test.yml
index 321f49c..b666769 100644
--- a/mock-ecord-container-test.yml
+++ b/mock-ecord-container-test.yml
@@ -22,15 +22,6 @@
roles:
- xos-onboard-test-hosts
-- name: Include vars
- hosts: all
- tasks:
- - name: Include variables
- include_vars: "{{ item }}"
- with_items:
- - "{{ playbook_dir }}/profile_manifests/{{ cord_profile }}.yml"
- - "{{ playbook_dir }}/profile_manifests/local_vars.yml"
-
- name: Check UI Container
hosts: xos-ui
connection: docker
diff --git a/mock-rcord-container-test.yml b/mock-rcord-container-test.yml
index baf17b0..7db60fb 100644
--- a/mock-rcord-container-test.yml
+++ b/mock-rcord-container-test.yml
@@ -24,15 +24,6 @@
roles:
- xos-onboard-test-hosts
-- name: Include vars
- hosts: all
- tasks:
- - name: Include variables
- include_vars: "{{ item }}"
- with_items:
- - "{{ playbook_dir }}/profile_manifests/{{ cord_profile }}.yml"
- - "{{ playbook_dir }}/profile_manifests/local_vars.yml"
-
- name: Check UI Container
hosts: xos-ui
connection: docker
diff --git a/monitoringagent-infra-install-config.yml b/monitoringagent-infra-install-config.yml
index d698471..a8494b0 100644
--- a/monitoringagent-infra-install-config.yml
+++ b/monitoringagent-infra-install-config.yml
@@ -20,15 +20,6 @@
# should be run with /etc/maas/ansible/pod-inventory as inventory file
# ansible-playbook -i /etc/maas/ansible/pod-inventory --extra-vars=@/opt/cord/build/genconfig/config.yml monitoringagent-infra-install-config.yml
-- name: Include vars
- hosts: all
- tasks:
- - name: Include variables
- include_vars: "{{ item }}"
- with_items:
- - "profile_manifests/{{ cord_profile }}.yml"
- - profile_manifests/local_vars.yml
-
- name: Create monitoringagent config
hosts: head
roles:
diff --git a/monitoringservice-enable-exampleservicemonitoring.yml b/monitoringservice-enable-exampleservicemonitoring.yml
index 717af9e..b4634bb 100644
--- a/monitoringservice-enable-exampleservicemonitoring.yml
+++ b/monitoringservice-enable-exampleservicemonitoring.yml
@@ -19,15 +19,6 @@
# Enables monitoring for exampleservice
# ansible-playbook -i inventory/rcord --extra-vars @../genconfig/config.yml monitoringservice-enable-exampleservicemonitoring.yml
-- name: Include vars
- hosts: all
- tasks:
- - name: Include variables
- include_vars: "{{ item }}"
- with_items:
- - "profile_manifests/{{ cord_profile }}.yml"
- - profile_manifests/local_vars.yml
-
- name: Create config files for enabling exampleservice monitoring
hosts: head
roles:
diff --git a/monitoringservice-enable-inframonitoring-config.yml b/monitoringservice-enable-inframonitoring-config.yml
index 53a63ad..514dfe2 100644
--- a/monitoringservice-enable-inframonitoring-config.yml
+++ b/monitoringservice-enable-inframonitoring-config.yml
@@ -20,15 +20,6 @@
# should be run with /etc/maas/ansible/pod-inventory as inventory file
# ansible-playbook -i /etc/maas/ansible/pod-inventory --extra-vars=@/opt/cord/build/genconfig/config.yml monitoringservice-enable-inframonitoring-config.yml
-- name: Include vars
- hosts: all
- tasks:
- - name: Include variables
- include_vars: "{{ item }}"
- with_items:
- - "profile_manifests/{{ cord_profile }}.yml"
- - profile_manifests/local_vars.yml
-
- name: Create config files for enabling infrastructure monitoring
hosts: head
roles:
diff --git a/monitoringservice-enable-inframonitoring.yml b/monitoringservice-enable-inframonitoring.yml
index 1614085..98303ba 100644
--- a/monitoringservice-enable-inframonitoring.yml
+++ b/monitoringservice-enable-inframonitoring.yml
@@ -19,15 +19,6 @@
# Enables monitoring for infrastructure services (OpenStack and ONOS)
# ansible-playbook -i inventory/rcord --extra-vars @../genconfig/config.yml monitoringservice-enable-inframonitoring.yml
-- name: Include vars
- hosts: all
- tasks:
- - name: Include variables
- include_vars: "{{ item }}"
- with_items:
- - "profile_manifests/{{ cord_profile }}.yml"
- - profile_manifests/local_vars.yml
-
- include: add-onboard-containers-playbook.yml
- name: Run role to execute TOSCA file
diff --git a/monitoringservice-enable-vsgmonitoring.yml b/monitoringservice-enable-vsgmonitoring.yml
index cefc0df..f97abe8 100644
--- a/monitoringservice-enable-vsgmonitoring.yml
+++ b/monitoringservice-enable-vsgmonitoring.yml
@@ -19,15 +19,6 @@
# Enables monitoring for vSG service
# ansible-playbook -i inventory/rcord --extra-vars @../genconfig/config.yml monitoringservice-enable-vsgmonitoring.yml
-- name: Include vars
- hosts: all
- tasks:
- - name: Include variables
- include_vars: "{{ item }}"
- with_items:
- - "profile_manifests/{{ cord_profile }}.yml"
- - profile_manifests/local_vars.yml
-
- name: Create config files for enabling vSG monitoring
hosts: head
roles:
diff --git a/monitoringservice-test-exampleservicemetrics.yaml b/monitoringservice-test-exampleservicemetrics.yaml
index dcf4edf..e0be295 100644
--- a/monitoringservice-test-exampleservicemetrics.yaml
+++ b/monitoringservice-test-exampleservicemetrics.yaml
@@ -18,15 +18,6 @@
# monitoringservice_test_exampleservicemetrics.yml
# Tests the monitoringservice after enabling monitoring for exampleservice
-- name: Include vars
- hosts: all
- tasks:
- - name: Include variables
- include_vars: "{{ item }}"
- with_items:
- - "profile_manifests/{{ cord_profile }}.yml"
- - profile_manifests/local_vars.yml
-
- name: Invoke common+test-exampleservicemonitoring roles
hosts: head
roles:
diff --git a/monitoringservice-test-inframetrics.yaml b/monitoringservice-test-inframetrics.yaml
index 1a0da62..13f20d0 100644
--- a/monitoringservice-test-inframetrics.yaml
+++ b/monitoringservice-test-inframetrics.yaml
@@ -18,15 +18,6 @@
# monitoringservice_test_inframetrics.yml
# Tests the monitoringservice after infrastructure monitoring is enabled
-- name: Include vars
- hosts: all
- tasks:
- - name: Include variables
- include_vars: "{{ item }}"
- with_items:
- - "profile_manifests/{{ cord_profile }}.yml"
- - profile_manifests/local_vars.yml
-
- name: Invoke common+test-inframonitoring roles
hosts: head
roles:
diff --git a/monitoringservice-test-initial.yaml b/monitoringservice-test-initial.yaml
index 858c095..cc0221e 100644
--- a/monitoringservice-test-initial.yaml
+++ b/monitoringservice-test-initial.yaml
@@ -18,15 +18,6 @@
# monitoringservice_test_initial.yml
# Tests the monitoringservice after it is onboarded
-- name: Include vars
- hosts: all
- tasks:
- - name: Include variables
- include_vars: "{{ item }}"
- with_items:
- - "profile_manifests/{{ cord_profile }}.yml"
- - profile_manifests/local_vars.yml
-
- name: Invoke common+test-initial roles
hosts: head
roles:
diff --git a/monitoringservice-test-vsgmetrics.yaml b/monitoringservice-test-vsgmetrics.yaml
index 6c02af7..590108b 100644
--- a/monitoringservice-test-vsgmetrics.yaml
+++ b/monitoringservice-test-vsgmetrics.yaml
@@ -18,15 +18,6 @@
# monitoringservice_test_vsgmetrics.yml
# Tests the monitoringservice after enabling monitoring for vSG service
-- name: Include vars
- hosts: all
- tasks:
- - name: Include variables
- include_vars: "{{ item }}"
- with_items:
- - "profile_manifests/{{ cord_profile }}.yml"
- - profile_manifests/local_vars.yml
-
- name: Invoke common+test-vsgmonitoring roles
hosts: head
roles:
diff --git a/onboard-exampleservice-playbook.yml b/onboard-exampleservice-playbook.yml
index 4ffe82d..4fdcf21 100644
--- a/onboard-exampleservice-playbook.yml
+++ b/onboard-exampleservice-playbook.yml
@@ -18,15 +18,6 @@
# onboard-exampleservice.yml
# Adds the exampleservice to the currently running pod
-- name: Include vars
- hosts: head
- tasks:
- - name: Include variables
- include_vars: "{{ item }}"
- with_items:
- - "profile_manifests/{{ cord_profile }}.yml"
- - profile_manifests/local_vars.yml
-
- name: Create exampleservice configuration
hosts: head
roles:
diff --git a/onboard-monitoringservice-playbook.yml b/onboard-monitoringservice-playbook.yml
index 9e8afd2..3edb7b9 100644
--- a/onboard-monitoringservice-playbook.yml
+++ b/onboard-monitoringservice-playbook.yml
@@ -18,15 +18,6 @@
# onboard-monitoringservice.yml
# Adds the monitoringservice to the currently running pod
-- name: Include vars
- hosts: all
- tasks:
- - name: Include variables
- include_vars: "{{ item }}"
- with_items:
- - "profile_manifests/{{ cord_profile }}.yml"
- - profile_manifests/local_vars.yml
-
- name: Create monitoringservice config
hosts: head
roles:
diff --git a/onboard-profile-playbook.yml b/onboard-profile-playbook.yml
index 2711146..4c527a6 100644
--- a/onboard-profile-playbook.yml
+++ b/onboard-profile-playbook.yml
@@ -26,15 +26,6 @@
roles:
- xos-ready
-- name: Include vars
- hosts: config
- tasks:
- - name: Include variables
- include_vars: "{{ item }}"
- with_items:
- - "profile_manifests/{{ cord_profile }}.yml"
- - profile_manifests/local_vars.yml
-
- name: Apply profile config (new engine)
hosts: head
roles:
diff --git a/onos-debug-playbook.yml b/onos-debug-playbook.yml
index 0bfa0cb..5ba835e 100644
--- a/onos-debug-playbook.yml
+++ b/onos-debug-playbook.yml
@@ -18,15 +18,6 @@
# onos-debug-playbook.yml
# Enables app-specific debugging settings in ONOS
-- name: Include vars
- hosts: head
- tasks:
- - name: Include variables
- include_vars: "{{ item }}"
- with_items:
- - "profile_manifests/{{ cord_profile }}.yml"
- - profile_manifests/local_vars.yml
-
- name: Enable debugging for onos apps
hosts: head
roles:
diff --git a/pod-test-playbook.yml b/pod-test-playbook.yml
index 8485273..5d5ad15 100644
--- a/pod-test-playbook.yml
+++ b/pod-test-playbook.yml
@@ -18,15 +18,6 @@
# pod-test-playbook.yml
# Tests CiaB cord-pod XOS configuration
-- name: Include vars
- hosts: all
- tasks:
- - name: Include variables
- include_vars: "{{ item }}"
- with_items:
- - "profile_manifests/{{ cord_profile }}.yml"
- - profile_manifests/local_vars.yml
-
- name: Create test client
hosts: head
become: yes
diff --git a/prep-buildnode-playbook.yml b/prep-buildnode-playbook.yml
index bb9d74d..88b0213 100644
--- a/prep-buildnode-playbook.yml
+++ b/prep-buildnode-playbook.yml
@@ -18,15 +18,6 @@
# prep-buildnode-playbook.yml
# Prep build node to create artifacts
-- name: Include vars
- hosts: build
- tasks:
- - name: Include variables
- include_vars: "{{ item }}"
- with_items:
- - "profile_manifests/{{ cord_profile }}.yml"
- - profile_manifests/local_vars.yml
-
- name: Install ansible on build node
hosts: build
roles:
diff --git a/prep-computenode-playbook.yml b/prep-computenode-playbook.yml
index e052fd0..5631124 100644
--- a/prep-computenode-playbook.yml
+++ b/prep-computenode-playbook.yml
@@ -18,15 +18,6 @@
# prep-computenode-playbook.yml
# Prepares a compute node on a CORD pod
-- name: Include vars
- hosts: compute
- tasks:
- - name: Include variables
- include_vars: "{{ item }}"
- with_items:
- - "profile_manifests/{{ cord_profile }}.yml"
- - profile_manifests/local_vars.yml
-
- name: Common prep, install SSL certificates
hosts: compute
become: yes
diff --git a/prep-headnode-playbook.yml b/prep-headnode-playbook.yml
index 9d89e50..04c0c07 100644
--- a/prep-headnode-playbook.yml
+++ b/prep-headnode-playbook.yml
@@ -16,15 +16,6 @@
# prep-headnode-playbook.yml
# Preps the head node of a CORD pod for thr est of the install
-- name: Include vars
- hosts: head, config
- tasks:
- - name: Include variables
- include_vars: "{{ item }}"
- with_items:
- - "profile_manifests/{{ cord_profile }}.yml"
- - profile_manifests/local_vars.yml
-
- name: Prep head node
hosts: head
roles:
diff --git a/publish-images-playbook.yml b/publish-images-playbook.yml
index d17851f..7e7473f 100644
--- a/publish-images-playbook.yml
+++ b/publish-images-playbook.yml
@@ -23,8 +23,6 @@
- name: Include variables
include_vars: "{{ item }}"
with_items:
- - "profile_manifests/{{ cord_profile }}.yml"
- - profile_manifests/local_vars.yml
- ../ib_actions.yml
- name: Publish Docker images to registry
diff --git a/publish-platform-install-playbook.yml b/publish-platform-install-playbook.yml
index 52082ba..e6781b5 100644
--- a/publish-platform-install-playbook.yml
+++ b/publish-platform-install-playbook.yml
@@ -17,15 +17,6 @@
---
# publish-platform-install-playbook.yml
-- name: Include vars
- hosts: build
- tasks:
- - name: Include variables
- include_vars: "{{ item }}"
- with_items:
- - "profile_manifests/{{ cord_profile }}.yml"
- - profile_manifests/local_vars.yml
-
- name: Publish the core image
hosts: build
roles:
diff --git a/start-xos-playbook.yml b/start-xos-playbook.yml
index 44cafe1..515c1bb 100644
--- a/start-xos-playbook.yml
+++ b/start-xos-playbook.yml
@@ -18,15 +18,6 @@
# start-xos-playbook.yml
# Start and configure XOS docker containers
-- name: Include vars
- hosts: all
- tasks:
- - name: Include variables
- include_vars: "{{ item }}"
- with_items:
- - "profile_manifests/{{ cord_profile }}.yml"
- - profile_manifests/local_vars.yml
-
- name: Start XOS containers with docker-compose
hosts: head
roles:
diff --git a/teardown-onos-playbook.yml b/teardown-onos-playbook.yml
index bd51c8d..4cc107d 100644
--- a/teardown-onos-playbook.yml
+++ b/teardown-onos-playbook.yml
@@ -16,15 +16,6 @@
# teardown-onos-playbook.yml
-- name: Include vars
- hosts: head
- tasks:
- - name: Include variables
- include_vars: "{{ item }}"
- with_items:
- - "profile_manifests/{{ cord_profile }}.yml"
- - profile_manifests/local_vars.yml
-
- name: Teardown ONOS docker containers
hosts: head
roles:
diff --git a/teardown-openstack-playbook.yml b/teardown-openstack-playbook.yml
index 797e4f1..9aa2792 100644
--- a/teardown-openstack-playbook.yml
+++ b/teardown-openstack-playbook.yml
@@ -17,15 +17,6 @@
---
# teardown-openstack-playbook.yml
-- name: Include vars
- hosts: all
- tasks:
- - name: Include variables
- include_vars: "{{ item }}"
- with_items:
- - "profile_manifests/{{ cord_profile }}.yml"
- - profile_manifests/local_vars.yml
-
- name: Teardown CORD profile
hosts: head
roles:
diff --git a/teardown-xos-playbook.yml b/teardown-xos-playbook.yml
index 2c6fc8f..2b522d5 100644
--- a/teardown-xos-playbook.yml
+++ b/teardown-xos-playbook.yml
@@ -15,15 +15,6 @@
# teardown-playbook.yml
-- name: Include vars
- hosts: head
- tasks:
- - name: Include variables
- include_vars: "{{ item }}"
- with_items:
- - "profile_manifests/{{ cord_profile }}.yml"
- - profile_manifests/local_vars.yml
-
- name: Teardown XOS containers
hosts: head
roles:
diff --git a/vtn-refresh-playbook.yml b/vtn-refresh-playbook.yml
index 5d94b6b..704b8f1 100644
--- a/vtn-refresh-playbook.yml
+++ b/vtn-refresh-playbook.yml
@@ -18,15 +18,6 @@
# vtn-refresh-playbook.yml
# Refreshes the VTN state, via the ONOS commandline
-- name: Include vars
- hosts: all
- tasks:
- - name: Include variables
- include_vars: "{{ item }}"
- with_items:
- - "profile_manifests/{{ cord_profile }}.yml"
- - profile_manifests/local_vars.yml
-
- name: Refresh VTN config
hosts: head
roles:
diff --git a/xos-container-test.yml b/xos-container-test.yml
index f8b0ffd..bf342f7 100644
--- a/xos-container-test.yml
+++ b/xos-container-test.yml
@@ -14,20 +14,6 @@
---
-- name: Include vars
- hosts: all
- tasks:
- - name: Include variables
- include_vars: "{{ item }}"
- with_items:
- - "{{ playbook_dir }}/profile_manifests/{{ cord_profile }}.yml"
- - "{{ playbook_dir }}/profile_manifests/local_vars.yml"
- tags:
- - rcord
- - ecord
- - ecord-global
- - mcord
-
- name: Add xos onboarded containers to inventory to test
hosts: head
roles: