summaryrefslogtreecommitdiffstats
path: root/xci/playbooks
diff options
context:
space:
mode:
Diffstat (limited to 'xci/playbooks')
-rw-r--r--xci/playbooks/configure-localhost.yml10
-rw-r--r--xci/playbooks/configure-opnfvhost.yml14
-rw-r--r--xci/playbooks/provision-vm-nodes.yml12
3 files changed, 18 insertions, 18 deletions
diff --git a/xci/playbooks/configure-localhost.yml b/xci/playbooks/configure-localhost.yml
index b6d0fccb..40147d31 100644
--- a/xci/playbooks/configure-localhost.yml
+++ b/xci/playbooks/configure-localhost.yml
@@ -14,7 +14,7 @@
- ../var/opnfv.yml
roles:
- role: remove-folders
- - { role: clone-repository, project: "opnfv/releng", repo: "{{ OPNFV_RELENG_GIT_URL }}", dest: "{{ OPNFV_RELENG_PATH }}", version: "{{ OPNFV_RELENG_VERSION }}" }
+ - { role: clone-repository, project: "opnfv/releng-xci", repo: "{{ OPNFV_RELENG_GIT_URL }}", dest: "{{ OPNFV_RELENG_PATH }}", version: "{{ OPNFV_RELENG_VERSION }}" }
- hosts: localhost
connection: local
@@ -23,7 +23,7 @@
- ../var/{{ ansible_os_family }}.yml
- ../var/opnfv.yml
tasks:
- - name: Synchronize local development releng repository to XCI paths
+ - name: Synchronize local development releng-xci repository to XCI paths
synchronize:
src: "{{ OPNFV_RELENG_DEV_PATH }}"
dest: "{{ OPNFV_RELENG_PATH }}"
@@ -47,13 +47,13 @@
- name: copy aio playbook
copy:
src: "{{XCI_FLAVOR_ANSIBLE_FILE_PATH}}/configure-opnfvhost.yml"
- dest: "{{OPNFV_RELENG_PATH}}/prototypes/xci/playbooks"
+ dest: "{{OPNFV_RELENG_PATH}}/xci/playbooks"
when: XCI_FLAVOR == "aio"
- name: copy flavor inventory
copy:
src: "{{XCI_FLAVOR_ANSIBLE_FILE_PATH}}/inventory"
- dest: "{{OPNFV_RELENG_PATH}}/prototypes/xci/playbooks"
+ dest: "{{OPNFV_RELENG_PATH}}/xci/playbooks"
- name: copy flavor vars
copy:
src: "{{XCI_FLAVOR_ANSIBLE_FILE_PATH}}/flavor-vars.yml"
- dest: "{{OPNFV_RELENG_PATH}}/prototypes/xci/var"
+ dest: "{{OPNFV_RELENG_PATH}}/xci/var"
diff --git a/xci/playbooks/configure-opnfvhost.yml b/xci/playbooks/configure-opnfvhost.yml
index a7ce5216..53e34418 100644
--- a/xci/playbooks/configure-opnfvhost.yml
+++ b/xci/playbooks/configure-opnfvhost.yml
@@ -15,7 +15,7 @@
- ../var/opnfv.yml
roles:
- role: remove-folders
- - { role: clone-repository, project: "opnfv/releng", repo: "{{ OPNFV_RELENG_GIT_URL }}", dest: "{{ OPNFV_RELENG_PATH }}", version: "{{ OPNFV_RELENG_VERSION }}" }
+ - { role: clone-repository, project: "opnfv/releng-xci", repo: "{{ OPNFV_RELENG_GIT_URL }}", dest: "{{ OPNFV_RELENG_PATH }}", version: "{{ OPNFV_RELENG_VERSION }}" }
- { role: clone-repository, project: "openstack/openstack-ansible", repo: "{{ OPENSTACK_OSA_GIT_URL }}", dest: "{{ OPENSTACK_OSA_PATH }}", version: "{{ OPENSTACK_OSA_VERSION }}" }
- hosts: opnfv
@@ -24,7 +24,7 @@
- ../var/{{ ansible_os_family }}.yml
- ../var/opnfv.yml
tasks:
- - name: Synchronize local development releng repository to XCI paths
+ - name: Synchronize local development releng-xci repository to XCI paths
synchronize:
src: "{{ OPNFV_RELENG_DEV_PATH }}"
dest: "{{ OPNFV_RELENG_PATH }}"
@@ -62,9 +62,9 @@
- name: fetch public key
fetch: src="/root/.ssh/id_rsa.pub" dest="{{ OPNFV_SSH_HOST_KEYS_PATH }}"
- name: copy flavor inventory
- shell: "/bin/cp -rf {{XCI_FLAVOR_ANSIBLE_FILE_PATH}}/inventory {{OPNFV_RELENG_PATH}}/prototypes/xci/playbooks"
+ shell: "/bin/cp -rf {{XCI_FLAVOR_ANSIBLE_FILE_PATH}}/inventory {{OPNFV_RELENG_PATH}}/xci/playbooks"
- name: copy flavor vars
- shell: "/bin/cp -rf {{XCI_FLAVOR_ANSIBLE_FILE_PATH}}/flavor-vars.yml {{OPNFV_RELENG_PATH}}/prototypes/xci/var"
+ shell: "/bin/cp -rf {{XCI_FLAVOR_ANSIBLE_FILE_PATH}}/flavor-vars.yml {{OPNFV_RELENG_PATH}}/xci/var"
- name: copy openstack_deploy
shell: "/bin/cp -rf {{OPENSTACK_OSA_PATH}}/etc/openstack_deploy {{OPENSTACK_OSA_ETC_PATH}}"
- name: copy openstack_user_config.yml
@@ -72,7 +72,7 @@
- name: copy user_variables.yml
shell: "/bin/cp -rf {{XCI_FLAVOR_ANSIBLE_FILE_PATH}}/user_variables.yml {{OPENSTACK_OSA_ETC_PATH}}"
- name: copy cinder.yml
- shell: "/bin/cp -rf {{OPNFV_RELENG_PATH}}/prototypes/xci/file/cinder.yml {{OPENSTACK_OSA_ETC_PATH}}/env.d"
+ shell: "/bin/cp -rf {{OPNFV_RELENG_PATH}}/xci/file/cinder.yml {{OPENSTACK_OSA_ETC_PATH}}/env.d"
# TODO: We need to get rid of this as soon as the issue is fixed upstream
- name: change the haproxy state from disable to enable
replace:
@@ -80,9 +80,9 @@
regexp: '(\s+)haproxy_state: disabled'
replace: '\1haproxy_state: enabled'
- name: copy OPNFV OpenStack playbook
- shell: "/bin/cp -rf {{OPNFV_RELENG_PATH}}/prototypes/xci/file/setup-openstack.yml {{OPENSTACK_OSA_PATH}}/playbooks"
+ shell: "/bin/cp -rf {{OPNFV_RELENG_PATH}}/xci/file/setup-openstack.yml {{OPENSTACK_OSA_PATH}}/playbooks"
- name: copy OPNFV role requirements
- shell: "/bin/cp -rf {{OPNFV_RELENG_PATH}}/prototypes/xci/file/ansible-role-requirements.yml {{OPENSTACK_OSA_PATH}}"
+ shell: "/bin/cp -rf {{OPNFV_RELENG_PATH}}/xci/file/ansible-role-requirements.yml {{OPENSTACK_OSA_PATH}}"
- name: bootstrap ansible on opnfv host
command: "/bin/bash ./scripts/bootstrap-ansible.sh"
args:
diff --git a/xci/playbooks/provision-vm-nodes.yml b/xci/playbooks/provision-vm-nodes.yml
index 92b5c553..e9b8fa2d 100644
--- a/xci/playbooks/provision-vm-nodes.yml
+++ b/xci/playbooks/provision-vm-nodes.yml
@@ -15,7 +15,7 @@
roles:
# using these roles here ensures that we can reuse this playbook in different context
- role: remove-folders
- - { role: clone-repository, project: "opnfv/releng", repo: "{{ OPNFV_RELENG_GIT_URL }}", dest: "{{ OPNFV_RELENG_PATH }}", version: "{{ OPNFV_RELENG_VERSION }}" }
+ - { role: clone-repository, project: "opnfv/releng-xci", repo: "{{ OPNFV_RELENG_GIT_URL }}", dest: "{{ OPNFV_RELENG_PATH }}", version: "{{ OPNFV_RELENG_VERSION }}" }
- { role: clone-repository, project: "opnfv/bifrost", repo: "{{ OPENSTACK_BIFROST_GIT_URL }}", dest: "{{ OPENSTACK_BIFROST_PATH }}", version: "{{ OPENSTACK_BIFROST_VERSION }}" }
- hosts: localhost
@@ -34,7 +34,7 @@
delete: yes
when:
- OPENSTACK_BIFROST_DEV_PATH != ""
- - name: Synchronize local development releng repository to XCI paths
+ - name: Synchronize local development releng-xci repository to XCI paths
synchronize:
src: "{{ OPNFV_RELENG_DEV_PATH }}"
dest: "{{ OPNFV_RELENG_PATH }}"
@@ -42,12 +42,12 @@
delete: yes
when:
- OPNFV_RELENG_DEV_PATH != ""
- - name: Copy extra vars to releng and bifrost
+ - name: Copy extra vars to releng-xci and bifrost
synchronize:
src: "{{ XCI_EXTRA_VARS_PATH }}"
dest: "{{ item }}"
with_items:
- - "{{ OPNFV_RELENG_PATH }}/prototypes/xci/playbooks"
+ - "{{ OPNFV_RELENG_PATH }}/xci/playbooks"
- "{{ OPENSTACK_BIFROST_PATH }}/playbooks/inventory"
when:
- XCI_EXTRA_VARS_PATH != ""
@@ -59,9 +59,9 @@
- ../var/{{ ansible_os_family }}.yml
- ../var/opnfv.yml
tasks:
- - name: combine opnfv/releng and openstack/bifrost scripts/playbooks
+ - name: combine opnfv/releng-xci and openstack/bifrost scripts/playbooks
copy:
- src: "{{ OPNFV_RELENG_PATH }}/prototypes/bifrost/"
+ src: "{{ OPNFV_RELENG_PATH }}/bifrost/"
dest: "{{ OPENSTACK_BIFROST_PATH }}"
- hosts: localhost