summaryrefslogtreecommitdiffstats
path: root/xci/playbooks
diff options
context:
space:
mode:
authorMarkos Chandras <mchandras@suse.de>2017-12-06 10:26:53 +0000
committerMarkos Chandras <mchandras@suse.de>2017-12-11 14:52:29 +0000
commit272820005530af9db4d06510b812f7ad60c17bd0 (patch)
treea10a890d567472cc6ed95f821695279df7537c01 /xci/playbooks
parent598bfb45906ead1f20009020a2466f21985d210f (diff)
xci: Use local playbooks for XCI deployments
Previously, we used to clone the releng-xci repository under a directory in /tmp, copy our changes to that repository and then run the xci-deploy.sh script from it. However, this made things far too complex for deployers and developers since some playbooks were used from the local repo whereas others were used from teh /tmp checkout. By running everything from our local repository simplifies things a lot since we can directly test our changes and also reduces the code we have in our playbooks. Change-Id: If16aa51b2846c170676df82d25cb90e26b1568b2 Signed-off-by: Markos Chandras <mchandras@suse.de>
Diffstat (limited to 'xci/playbooks')
-rw-r--r--xci/playbooks/configure-localhost.yml73
-rw-r--r--xci/playbooks/configure-opnfvhost.yml99
-rw-r--r--xci/playbooks/configure-targethosts.yml16
-rw-r--r--xci/playbooks/roles/clone-repository/tasks/main.yml1
-rw-r--r--xci/playbooks/roles/remove-folders/tasks/main.yml22
5 files changed, 76 insertions, 135 deletions
diff --git a/xci/playbooks/configure-localhost.yml b/xci/playbooks/configure-localhost.yml
index a0837117..0265fd2c 100644
--- a/xci/playbooks/configure-localhost.yml
+++ b/xci/playbooks/configure-localhost.yml
@@ -9,77 +9,36 @@
##############################################################################
- hosts: localhost
connection: local
- become: yes
vars_files:
- ../var/opnfv.yml
- pre_tasks:
- - name: Load distribution variables
- include_vars:
- file: ../var/{{ ansible_os_family }}.yml
- roles:
- - role: remove-folders
-- hosts: localhost
- connection: local
- vars_files:
- - ../var/opnfv.yml
- pre_tasks:
- - name: Load distribution variables
- include_vars:
- file: ../var/{{ ansible_os_family }}.yml
roles:
- - { 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-openstack_openrc", repo: "{{ OPENSTACK_OSA_OPENRC_GIT_URL }}", dest: "{{ OPENSTACK_OSA_OPENRC_PATH }}", version: "master" }
-- hosts: localhost
- connection: local
- vars_files:
- - ../var/opnfv.yml
- tasks:
- - name: Load distribution variables
- include_vars:
- file: ../var/{{ ansible_os_family }}.yml
- - name: Synchronize local development releng-xci repository to XCI paths
- synchronize:
- src: "{{ XCI_PATH }}"
- dest: "{{ OPNFV_RELENG_PATH }}"
- recursive: yes
- delete: yes
+ - role: clone-repository
+ project: "openstack/openstack-ansible-openstack_openrc"
+ repo: "{{ OPENSTACK_OSA_OPENRC_GIT_URL }}"
+ dest: roles/openstack-ansible-openstack_openrc
+ version: "master"
-- hosts: localhost
- connection: local
- vars_files:
- - ../var/opnfv.yml
tasks:
- name: Load distribution variables
include_vars:
file: ../var/{{ ansible_os_family }}.yml
+ - name: cleanup leftovers of previous deployment
+ file:
+ path: "{{ item }}"
+ state: absent
+ recurse: no
+ with_items:
+ - "{{ OPENSTACK_BIFROST_PATH }}"
+ - "{{ OPENSTACK_OSA_PATH }}"
+ - "{{ OPENSTACK_OSA_ETC_PATH }}"
+ - "{{ LOG_PATH }} "
+ - "{{ OPNFV_SSH_HOST_KEYS_PATH }}"
- name: create log directory {{LOG_PATH}}
file:
path: "{{LOG_PATH}}"
state: directory
recurse: no
- # when the deployment is aio, we overwrite and use playbook, configure-opnfvhost.yml, since everything gets installed on opnfv host
- - name: copy aio playbook
- copy:
- src: "{{XCI_FLAVOR_ANSIBLE_FILE_PATH}}/configure-opnfvhost.yml"
- 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}}/xci/playbooks"
- - name: copy flavor vars
- copy:
- src: "{{XCI_FLAVOR_ANSIBLE_FILE_PATH}}/flavor-vars.yml"
- dest: "{{OPNFV_RELENG_PATH}}/xci/var"
-- hosts: localhost
- connection: local
- vars_files:
- - ../var/opnfv.yml
- tasks:
- - name: Load distribution variables
- include_vars:
- file: ../var/{{ ansible_os_family }}.yml
- name: check if certificate directory /etc/ssl/certs exists already
stat: path=/etc/ssl/certs
register: check_etc_ssl_certs
diff --git a/xci/playbooks/configure-opnfvhost.yml b/xci/playbooks/configure-opnfvhost.yml
index 0f288459..e9e4f6bb 100644
--- a/xci/playbooks/configure-opnfvhost.yml
+++ b/xci/playbooks/configure-opnfvhost.yml
@@ -10,73 +10,66 @@
- hosts: opnfv
remote_user: root
vars_files:
- - ../var/flavor-vars.yml
- ../var/opnfv.yml
pre_tasks:
- name: Load distribution variables
include_vars:
file: ../var/{{ ansible_os_family }}.yml
- roles:
- - { 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 }}" }
+ file: ../file/{{ XCI_FLAVOR }}/flavor-vars.yml
-- hosts: opnfv
- remote_user: root
- vars_files:
- - ../var/opnfv.yml
- tasks:
- - name: Load distribution variables
- include_vars:
- file: ../var/{{ ansible_os_family }}.yml
- - name: Synchronize local development releng-xci repository to XCI paths
- synchronize:
- src: "{{ XCI_PATH }}"
- dest: "{{ OPNFV_RELENG_PATH }}"
- recursive: yes
- delete: yes
- - name: Synchronize local development openstack-ansible repository to XCI paths
- synchronize:
- src: "{{ OPENSTACK_OSA_DEV_PATH }}"
- dest: "{{ OPENSTACK_OSA_PATH }}"
- recursive: yes
- delete: yes
- when:
- - OPENSTACK_OSA_DEV_PATH != ""
+ roles:
+ - role: clone-repository
+ project: "openstack/openstack-ansible"
+ repo: "{{ OPENSTACK_OSA_GIT_URL }}"
+ dest: "{{ OPENSTACK_OSA_PATH }}"
+ version: "{{ OPENSTACK_OSA_VERSION }}"
- hosts: opnfv
remote_user: root
vars_files:
- - ../var/flavor-vars.yml
- ../var/opnfv.yml
pre_tasks:
- name: Load distribution variables
include_vars:
- file: ../var/{{ ansible_os_family }}.yml
+ file: "{{ item }}"
+ with_items:
+ - ../var/{{ ansible_os_family }}.yml
+ - ../file/{{ XCI_FLAVOR }}/flavor-vars.yml
+
roles:
- role: configure-network
+
tasks:
- name: generate SSH keys
shell: ssh-keygen -b 2048 -t rsa -f /root/.ssh/id_rsa -q -N ""
args:
- creates: /root/.ssh/id_rsa
- - name: ensure ssh key storage directory exists
- file:
- path: "{{ OPNFV_SSH_HOST_KEYS_PATH }}"
- state: directory
+ creates: "{{ ansible_env.HOME }}/.ssh/id_rsa"
- name: fetch public key
- fetch: src="/root/.ssh/id_rsa.pub" dest="{{ OPNFV_SSH_HOST_KEYS_PATH }}"
+ fetch:
+ src: "{{ ansible_env.HOME }}/.ssh/id_rsa.pub"
+ dest: "../file/authorized_keys"
+ flat: yes
+ - name: Set facts for remote deployment
+ set_fact:
+ remote_xci_path: "{{ ansible_env.HOME }}/releng-xci"
+ remote_xci_flavor_files: "{{ ansible_env.HOME }}/releng-xci/xci/file/{{ XCI_FLAVOR }}"
+ remote_xci_playbooks: "{{ ansible_env.HOME }}/releng-xci/xci/playbooks"
+ - name: Copy releng-xci to remote host
+ synchronize:
+ src: "{{ XCI_PATH }}/"
+ dest: "{{ remote_xci_path }}"
+ recursive: yes
+ delete: yes
- name: copy flavor inventory
- 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}}/xci/var"
+ shell: "/bin/cp -rf {{ remote_xci_flavor_files }}/inventory {{ remote_xci_playbooks }}"
- name: copy openstack_deploy
shell: "/bin/cp -rf {{OPENSTACK_OSA_PATH}}/etc/openstack_deploy {{OPENSTACK_OSA_ETC_PATH}}"
- name: copy openstack_user_config.yml
- shell: "/bin/cp -rf {{XCI_FLAVOR_ANSIBLE_FILE_PATH}}/openstack_user_config.yml {{OPENSTACK_OSA_ETC_PATH}}"
+ shell: "/bin/cp -rf {{ remote_xci_flavor_files }}/openstack_user_config.yml {{OPENSTACK_OSA_ETC_PATH}}"
- name: copy all user override files
- shell: "/bin/cp -rf {{XCI_FLAVOR_ANSIBLE_FILE_PATH}}/user_variables.yml {{OPENSTACK_OSA_ETC_PATH}}"
+ shell: "/bin/cp -rf {{ remote_xci_flavor_files }}/user_variables.yml {{OPENSTACK_OSA_ETC_PATH}}"
- name: copy cinder.yml
- shell: "/bin/cp -rf {{OPNFV_RELENG_PATH}}/xci/file/cinder.yml {{OPENSTACK_OSA_ETC_PATH}}/env.d"
+ shell: "/bin/cp -rf {{ remote_xci_path }}/xci/file/cinder.yml {{OPENSTACK_OSA_ETC_PATH}}/env.d"
- name: Configure AIO tempest
lineinfile:
path: "{{ OPENSTACK_OSA_ETC_PATH }}/user_variables.yml"
@@ -87,11 +80,11 @@
- "tempest_run"
- block:
- name: copy ceph.yml
- shell: "/bin/cp -rf {{XCI_FLAVOR_ANSIBLE_FILE_PATH}}/ceph.yml {{OPENSTACK_OSA_ETC_PATH}}/conf.d/"
+ shell: "/bin/cp -rf {{ remote_xci_flavor_files }}/ceph.yml {{OPENSTACK_OSA_ETC_PATH}}/conf.d/"
- name: copy user_ceph.yml
- shell: "/bin/cp -rf {{XCI_FLAVOR_ANSIBLE_FILE_PATH}}/user_ceph.yml {{OPENSTACK_OSA_ETC_PATH}}/user_ceph.yml"
+ shell: "/bin/cp -rf {{ remote_xci_flavor_files }}/user_ceph.yml {{OPENSTACK_OSA_ETC_PATH}}/user_ceph.yml"
- name: copy user_variables_ceph.yml
- shell: "/bin/cp -rf {{XCI_FLAVOR_ANSIBLE_FILE_PATH}}/user_variables_ceph.yml {{OPENSTACK_OSA_ETC_PATH}}/user_variables_ceph.yml"
+ shell: "/bin/cp -rf {{ remote_xci_flavor_files }}/user_variables_ceph.yml {{OPENSTACK_OSA_ETC_PATH}}/user_variables_ceph.yml"
when: XCI_CEPH_ENABLED == "true"
# 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
@@ -100,16 +93,16 @@
regexp: '(\s+)haproxy_state: disabled'
replace: '\1haproxy_state: enabled'
- name: copy OPNFV OpenStack playbook
- shell: "/bin/cp -rf {{OPNFV_RELENG_PATH}}/xci/file/setup-openstack.yml {{OPENSTACK_OSA_PATH}}/playbooks"
+ shell: "/bin/cp -rf {{ remote_xci_path }}/xci/file/setup-openstack.yml {{OPENSTACK_OSA_PATH}}/playbooks"
- name: copy pinned versions of OSA Roles and global requirements
- shell: "/bin/cp -rf {{OPNFV_RELENG_PATH}}/xci/file/{{ item }} {{OPENSTACK_OSA_PATH}}/{{ item }}"
+ shell: "/bin/cp -rf {{ remote_xci_path }}/xci/file/{{ item }} {{OPENSTACK_OSA_PATH}}/{{ item }}"
with_items:
- "ansible-role-requirements.yml"
- "global-requirement-pins.txt"
when:
- OPENSTACK_OSA_VERSION != "master"
- name: copy pinned versions of OpenStack services
- shell: "/bin/cp -rf {{OPNFV_RELENG_PATH}}/xci/file/openstack_services.yml {{OPENSTACK_OSA_PATH}}/playbooks/defaults/repo_packages/openstack_services.yml"
+ shell: "/bin/cp -rf {{ remote_xci_path }}/xci/file/openstack_services.yml {{OPENSTACK_OSA_PATH}}/playbooks/defaults/repo_packages/openstack_services.yml"
when:
- OPENSTACK_OSA_VERSION != "master"
- include: bootstrap-scenarios.yml
@@ -172,23 +165,25 @@
vars_files:
- ../var/opnfv.yml
tasks:
- - name: Generate authorized_keys
- shell: "/bin/cat {{ OPNFV_SSH_HOST_KEYS_PATH }}/opnfv/root/.ssh/id_rsa.pub >> ../file/authorized_keys"
- name: Append public keys to authorized_keys
shell: "/bin/cat {{ ansible_env.HOME }}/.ssh/id_rsa.pub >> ../file/authorized_keys"
- hosts: opnfv
remote_user: root
vars_files:
- - ../var/flavor-vars.yml
- ../var/opnfv.yml
- - "{{ XCI_FLAVOR_ANSIBLE_FILE_PATH }}/user_variables.yml"
pre_tasks:
- name: Load distribution variables
include_vars:
- file: ../var/{{ ansible_os_family }}.yml
+ file: "{{ item }}"
+ with_items:
+ - ../var/opnfv.yml
+ - ../var/{{ ansible_os_family }}.yml
+ - ../file/{{ XCI_FLAVOR }}/flavor-vars.yml
+ - ../file/{{ XCI_FLAVOR }}/user_variables.yml
roles:
- role: "openstack-ansible-openstack_openrc"
+
tasks:
- name: add extra insecure flag to generated openrc
blockinfile:
@@ -199,5 +194,5 @@
- name: fetch generated openrc
fetch:
src: "{{ ansible_env.HOME }}/openrc"
- dest: "{{ XCI_DEVEL_ROOT }}/"
+ dest: "{{ XCI_PATH }}/.cache/openrc"
flat: true
diff --git a/xci/playbooks/configure-targethosts.yml b/xci/playbooks/configure-targethosts.yml
index b7b09cfb..d136f436 100644
--- a/xci/playbooks/configure-targethosts.yml
+++ b/xci/playbooks/configure-targethosts.yml
@@ -10,11 +10,15 @@
- hosts: controller
remote_user: root
vars_files:
- - ../var/flavor-vars.yml
+ - ../var/opnfv.yml
+
pre_tasks:
- name: Load distribution variables
include_vars:
- file: ../var/{{ ansible_os_family }}.yml
+ file: "{{ item }}"
+ with_items:
+ - ../var/{{ ansible_os_family }}.yml
+ - ../file/{{ XCI_FLAVOR }}/flavor-vars.yml
roles:
- role: configure-network
# we need to force sync time with ntp or the nodes will be out of sync timewise
@@ -23,12 +27,16 @@
- hosts: compute
remote_user: root
vars_files:
- - ../var/flavor-vars.yml
- ../var/opnfv.yml
+
pre_tasks:
- name: Load distribution variables
include_vars:
- file: ../var/{{ ansible_os_family }}.yml
+ file: "{{ item }}"
+ with_items:
+ - ../var/opnfv.yml
+ - ../var/{{ ansible_os_family }}.yml
+ - ../file/{{ XCI_FLAVOR }}/flavor-vars.yml
roles:
- role: configure-network
# we need to force sync time with ntp or the nodes will be out of sync timewise
diff --git a/xci/playbooks/roles/clone-repository/tasks/main.yml b/xci/playbooks/roles/clone-repository/tasks/main.yml
index 3f7e0910..a124003d 100644
--- a/xci/playbooks/roles/clone-repository/tasks/main.yml
+++ b/xci/playbooks/roles/clone-repository/tasks/main.yml
@@ -12,3 +12,4 @@
repo: "{{ repo }}"
dest: "{{ dest }}"
version: "{{ version }}"
+ force: yes
diff --git a/xci/playbooks/roles/remove-folders/tasks/main.yml b/xci/playbooks/roles/remove-folders/tasks/main.yml
deleted file mode 100644
index cb81dae9..00000000
--- a/xci/playbooks/roles/remove-folders/tasks/main.yml
+++ /dev/null
@@ -1,22 +0,0 @@
----
-# SPDX-license-identifier: Apache-2.0
-##############################################################################
-# Copyright (c) 2017 Ericsson AB and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-- name: cleanup leftovers of previous deployment
- file:
- path: "{{ item }}"
- state: absent
- recurse: no
- with_items:
- - "{{ OPNFV_RELENG_PATH }}"
- - "{{ OPENSTACK_BIFROST_PATH }}"
- - "{{ OPENSTACK_OSA_PATH }}"
- - "{{ OPENSTACK_OSA_ETC_PATH }}"
- - "{{ XCI_DEVEL_ROOT }}"
- - "{{ LOG_PATH }} "
- - "{{ OPNFV_SSH_HOST_KEYS_PATH }}"