From b7c67c901075fc44a087f38e6b11fdac0b1d04d8 Mon Sep 17 00:00:00 2001 From: wutianwei Date: Tue, 2 Jan 2018 16:49:48 +0800 Subject: [PATCH] [XCI] move osa files into xci/nfvi/osa/files we maybe introduce other NFVI in the future in XCI. it is necessary to put the nfvi files to corresponding directory xci/nfvi/$NFVI/files, otherwise the files directory will be confused. Change-Id: Iea98167ff0bc8d338a94fe1c064ac0ab396c53d3 Signed-off-by: wutianwei --- xci/config/env-vars | 2 +- xci/{file => files}/install-ansible.sh | 0 xci/{file => nfvi/osa/files}/aio/flavor-vars.yml | 0 xci/{file => nfvi/osa/files}/aio/inventory | 0 xci/{file => nfvi/osa/files}/ha/ceph.yml | 0 xci/{file => nfvi/osa/files}/ha/flavor-vars.yml | 0 xci/{file => nfvi/osa/files}/ha/inventory | 0 xci/{file => nfvi/osa/files}/ha/openstack_user_config.yml | 0 xci/{file => nfvi/osa/files}/ha/user_ceph.yml | 0 xci/{file => nfvi/osa/files}/ha/user_variables.yml | 0 xci/{file => nfvi/osa/files}/ha/user_variables_ceph.yml | 0 xci/{file => nfvi/osa/files}/mini/ceph.yml | 0 xci/{file => nfvi/osa/files}/mini/flavor-vars.yml | 0 xci/{file => nfvi/osa/files}/mini/inventory | 0 xci/{file => nfvi/osa/files}/mini/openstack_user_config.yml | 0 xci/{file => nfvi/osa/files}/mini/user_ceph.yml | 0 xci/{file => nfvi/osa/files}/mini/user_variables.yml | 0 xci/{file => nfvi/osa/files}/mini/user_variables_ceph.yml | 0 xci/{file => nfvi/osa/files}/noha/ceph.yml | 0 xci/{file => nfvi/osa/files}/noha/flavor-vars.yml | 0 xci/{file => nfvi/osa/files}/noha/inventory | 0 xci/{file => nfvi/osa/files}/noha/openstack_user_config.yml | 0 xci/{file => nfvi/osa/files}/noha/user_ceph.yml | 0 xci/{file => nfvi/osa/files}/noha/user_variables.yml | 0 xci/{file => nfvi/osa/files}/noha/user_variables_ceph.yml | 0 xci/nfvi/osa/nfvi-deploy.sh | 2 +- xci/nfvi/osa/playbooks/configure-opnfvhost.yml | 12 ++++++------ xci/nfvi/osa/playbooks/configure-targethosts.yml | 6 +++--- xci/var/opnfv.yml | 1 + xci/xci-deploy.sh | 4 ++-- 30 files changed, 14 insertions(+), 13 deletions(-) rename xci/{file => files}/install-ansible.sh (100%) rename xci/{file => nfvi/osa/files}/aio/flavor-vars.yml (100%) rename xci/{file => nfvi/osa/files}/aio/inventory (100%) rename xci/{file => nfvi/osa/files}/ha/ceph.yml (100%) rename xci/{file => nfvi/osa/files}/ha/flavor-vars.yml (100%) rename xci/{file => nfvi/osa/files}/ha/inventory (100%) rename xci/{file => nfvi/osa/files}/ha/openstack_user_config.yml (100%) rename xci/{file => nfvi/osa/files}/ha/user_ceph.yml (100%) rename xci/{file => nfvi/osa/files}/ha/user_variables.yml (100%) rename xci/{file => nfvi/osa/files}/ha/user_variables_ceph.yml (100%) rename xci/{file => nfvi/osa/files}/mini/ceph.yml (100%) rename xci/{file => nfvi/osa/files}/mini/flavor-vars.yml (100%) rename xci/{file => nfvi/osa/files}/mini/inventory (100%) rename xci/{file => nfvi/osa/files}/mini/openstack_user_config.yml (100%) rename xci/{file => nfvi/osa/files}/mini/user_ceph.yml (100%) rename xci/{file => nfvi/osa/files}/mini/user_variables.yml (100%) rename xci/{file => nfvi/osa/files}/mini/user_variables_ceph.yml (100%) rename xci/{file => nfvi/osa/files}/noha/ceph.yml (100%) rename xci/{file => nfvi/osa/files}/noha/flavor-vars.yml (100%) rename xci/{file => nfvi/osa/files}/noha/inventory (100%) rename xci/{file => nfvi/osa/files}/noha/openstack_user_config.yml (100%) rename xci/{file => nfvi/osa/files}/noha/user_ceph.yml (100%) rename xci/{file => nfvi/osa/files}/noha/user_variables.yml (100%) rename xci/{file => nfvi/osa/files}/noha/user_variables_ceph.yml (100%) diff --git a/xci/config/env-vars b/xci/config/env-vars index 8560c996..b4a40165 100755 --- a/xci/config/env-vars +++ b/xci/config/env-vars @@ -8,7 +8,7 @@ export OPENSTACK_OSA_GIT_URL=https://git.openstack.org/openstack/openstack-ansib export OPENSTACK_OSA_OPENRC_GIT_URL=https://git.openstack.org/openstack/openstack-ansible-openstack_openrc export OPENSTACK_OSA_ETC_PATH=/etc/openstack_deploy export OPNFV_HOST_IP=192.168.122.2 -export XCI_FLAVOR_ANSIBLE_FILE_PATH=$XCI_PATH/xci/file/$XCI_FLAVOR +export XCI_FLAVOR_ANSIBLE_FILE_PATH=$XCI_PATH/xci/nfvi/$XCI_NFVI/files/$XCI_FLAVOR export CI_LOOP=${CI_LOOP:-daily} export JOB_NAME=${JOB_NAME:-false} # XCI_CACHE is a cache on localhost where repositories and scenarios are cloned. diff --git a/xci/file/install-ansible.sh b/xci/files/install-ansible.sh similarity index 100% rename from xci/file/install-ansible.sh rename to xci/files/install-ansible.sh diff --git a/xci/file/aio/flavor-vars.yml b/xci/nfvi/osa/files/aio/flavor-vars.yml similarity index 100% rename from xci/file/aio/flavor-vars.yml rename to xci/nfvi/osa/files/aio/flavor-vars.yml diff --git a/xci/file/aio/inventory b/xci/nfvi/osa/files/aio/inventory similarity index 100% rename from xci/file/aio/inventory rename to xci/nfvi/osa/files/aio/inventory diff --git a/xci/file/ha/ceph.yml b/xci/nfvi/osa/files/ha/ceph.yml similarity index 100% rename from xci/file/ha/ceph.yml rename to xci/nfvi/osa/files/ha/ceph.yml diff --git a/xci/file/ha/flavor-vars.yml b/xci/nfvi/osa/files/ha/flavor-vars.yml similarity index 100% rename from xci/file/ha/flavor-vars.yml rename to xci/nfvi/osa/files/ha/flavor-vars.yml diff --git a/xci/file/ha/inventory b/xci/nfvi/osa/files/ha/inventory similarity index 100% rename from xci/file/ha/inventory rename to xci/nfvi/osa/files/ha/inventory diff --git a/xci/file/ha/openstack_user_config.yml b/xci/nfvi/osa/files/ha/openstack_user_config.yml similarity index 100% rename from xci/file/ha/openstack_user_config.yml rename to xci/nfvi/osa/files/ha/openstack_user_config.yml diff --git a/xci/file/ha/user_ceph.yml b/xci/nfvi/osa/files/ha/user_ceph.yml similarity index 100% rename from xci/file/ha/user_ceph.yml rename to xci/nfvi/osa/files/ha/user_ceph.yml diff --git a/xci/file/ha/user_variables.yml b/xci/nfvi/osa/files/ha/user_variables.yml similarity index 100% rename from xci/file/ha/user_variables.yml rename to xci/nfvi/osa/files/ha/user_variables.yml diff --git a/xci/file/ha/user_variables_ceph.yml b/xci/nfvi/osa/files/ha/user_variables_ceph.yml similarity index 100% rename from xci/file/ha/user_variables_ceph.yml rename to xci/nfvi/osa/files/ha/user_variables_ceph.yml diff --git a/xci/file/mini/ceph.yml b/xci/nfvi/osa/files/mini/ceph.yml similarity index 100% rename from xci/file/mini/ceph.yml rename to xci/nfvi/osa/files/mini/ceph.yml diff --git a/xci/file/mini/flavor-vars.yml b/xci/nfvi/osa/files/mini/flavor-vars.yml similarity index 100% rename from xci/file/mini/flavor-vars.yml rename to xci/nfvi/osa/files/mini/flavor-vars.yml diff --git a/xci/file/mini/inventory b/xci/nfvi/osa/files/mini/inventory similarity index 100% rename from xci/file/mini/inventory rename to xci/nfvi/osa/files/mini/inventory diff --git a/xci/file/mini/openstack_user_config.yml b/xci/nfvi/osa/files/mini/openstack_user_config.yml similarity index 100% rename from xci/file/mini/openstack_user_config.yml rename to xci/nfvi/osa/files/mini/openstack_user_config.yml diff --git a/xci/file/mini/user_ceph.yml b/xci/nfvi/osa/files/mini/user_ceph.yml similarity index 100% rename from xci/file/mini/user_ceph.yml rename to xci/nfvi/osa/files/mini/user_ceph.yml diff --git a/xci/file/mini/user_variables.yml b/xci/nfvi/osa/files/mini/user_variables.yml similarity index 100% rename from xci/file/mini/user_variables.yml rename to xci/nfvi/osa/files/mini/user_variables.yml diff --git a/xci/file/mini/user_variables_ceph.yml b/xci/nfvi/osa/files/mini/user_variables_ceph.yml similarity index 100% rename from xci/file/mini/user_variables_ceph.yml rename to xci/nfvi/osa/files/mini/user_variables_ceph.yml diff --git a/xci/file/noha/ceph.yml b/xci/nfvi/osa/files/noha/ceph.yml similarity index 100% rename from xci/file/noha/ceph.yml rename to xci/nfvi/osa/files/noha/ceph.yml diff --git a/xci/file/noha/flavor-vars.yml b/xci/nfvi/osa/files/noha/flavor-vars.yml similarity index 100% rename from xci/file/noha/flavor-vars.yml rename to xci/nfvi/osa/files/noha/flavor-vars.yml diff --git a/xci/file/noha/inventory b/xci/nfvi/osa/files/noha/inventory similarity index 100% rename from xci/file/noha/inventory rename to xci/nfvi/osa/files/noha/inventory diff --git a/xci/file/noha/openstack_user_config.yml b/xci/nfvi/osa/files/noha/openstack_user_config.yml similarity index 100% rename from xci/file/noha/openstack_user_config.yml rename to xci/nfvi/osa/files/noha/openstack_user_config.yml diff --git a/xci/file/noha/user_ceph.yml b/xci/nfvi/osa/files/noha/user_ceph.yml similarity index 100% rename from xci/file/noha/user_ceph.yml rename to xci/nfvi/osa/files/noha/user_ceph.yml diff --git a/xci/file/noha/user_variables.yml b/xci/nfvi/osa/files/noha/user_variables.yml similarity index 100% rename from xci/file/noha/user_variables.yml rename to xci/nfvi/osa/files/noha/user_variables.yml diff --git a/xci/file/noha/user_variables_ceph.yml b/xci/nfvi/osa/files/noha/user_variables_ceph.yml similarity index 100% rename from xci/file/noha/user_variables_ceph.yml rename to xci/nfvi/osa/files/noha/user_variables_ceph.yml diff --git a/xci/nfvi/osa/nfvi-deploy.sh b/xci/nfvi/osa/nfvi-deploy.sh index c4419de6..14577dd5 100755 --- a/xci/nfvi/osa/nfvi-deploy.sh +++ b/xci/nfvi/osa/nfvi-deploy.sh @@ -180,7 +180,7 @@ echo "Info: OpenStack installation is successfully completed!" #------------------------------------------------------------------------------- echo "Info: Openstack login details" echo "-----------------------------------------------------------------------" -OS_USER_CONFIG=$XCI_PATH/xci/file/$XCI_FLAVOR/openstack_user_config.yml +OS_USER_CONFIG=$XCI_FLAVOR_ANSIBLE_FILE_PATH/openstack_user_config.yml python -c \ "import yaml if '$XCI_FLAVOR' is 'aio': diff --git a/xci/nfvi/osa/playbooks/configure-opnfvhost.yml b/xci/nfvi/osa/playbooks/configure-opnfvhost.yml index 656f18e8..7f0e43f9 100644 --- a/xci/nfvi/osa/playbooks/configure-opnfvhost.yml +++ b/xci/nfvi/osa/playbooks/configure-opnfvhost.yml @@ -18,11 +18,11 @@ file: "{{ item }}" with_items: - "{{ XCI_PATH }}/xci/var/{{ ansible_os_family }}.yml" - - "{{ XCI_PATH }}/xci/file/{{ XCI_FLAVOR }}/flavor-vars.yml" + - "{{ XCI_FLAVOR_ANSIBLE_FILE_PATH }}/flavor-vars.yml" - 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_flavor_files: "{{ ansible_env.HOME }}/releng-xci/xci/nfvi/{{XCI_NFVI}}/files/{{ XCI_FLAVOR }}" remote_xci_playbooks: "{{ ansible_env.HOME }}/releng-xci/xci/playbooks" roles: @@ -37,7 +37,7 @@ - name: fetch public key fetch: src: "{{ ansible_env.HOME }}/.ssh/id_rsa.pub" - dest: "{{ XCI_PATH }}/xci/file/authorized_keys" + dest: "{{ XCI_PATH }}/xci/files/authorized_keys" flat: yes - name: Copy releng-xci to remote host synchronize: @@ -152,7 +152,7 @@ tasks: - name: Append public keys to authorized_keys - shell: "/bin/cat {{ ansible_env.HOME }}/.ssh/id_rsa.pub >> {{ XCI_PATH }}/xci/file/authorized_keys" + shell: "/bin/cat {{ ansible_env.HOME }}/.ssh/id_rsa.pub >> {{ XCI_PATH }}/xci/files/authorized_keys" - hosts: opnfv remote_user: root @@ -166,8 +166,8 @@ failed_when: false with_items: - "{{ XCI_PATH }}/xci/var/{{ ansible_os_family }}.yml" - - "{{ XCI_PATH }}/xci/file/{{ XCI_FLAVOR }}/flavor-vars.yml" - - "{{ XCI_PATH }}/xci/file/{{ XCI_FLAVOR }}/user_variables.yml" + - "{{ XCI_FLAVOR_ANSIBLE_FILE_PATH }}/flavor-vars.yml" + - "{{ XCI_FLAVOR_ANSIBLE_FILE_PATH }}/user_variables.yml" roles: - role: "openstack-ansible-openstack_openrc" diff --git a/xci/nfvi/osa/playbooks/configure-targethosts.yml b/xci/nfvi/osa/playbooks/configure-targethosts.yml index 14a9149b..fb43a920 100644 --- a/xci/nfvi/osa/playbooks/configure-targethosts.yml +++ b/xci/nfvi/osa/playbooks/configure-targethosts.yml @@ -4,7 +4,7 @@ tasks: - name: add public key to host copy: - src: "{{ XCI_PATH }}/xci/file/authorized_keys" + src: "{{ XCI_PATH }}/xci/files/authorized_keys" dest: /root/.ssh/authorized_keys - hosts: controller @@ -18,7 +18,7 @@ file: "{{ item }}" with_items: - "{{ XCI_PATH }}/xci/var/{{ ansible_os_family }}.yml" - - "{{ XCI_PATH }}/xci/file/{{ XCI_FLAVOR }}/flavor-vars.yml" + - "{{ XCI_FLAVOR_ANSIBLE_FILE_PATH }}/flavor-vars.yml" roles: - role: configure-network # we need to force sync time with ntp or the nodes will be out of sync timewise @@ -35,7 +35,7 @@ file: "{{ item }}" with_items: - "{{ XCI_PATH }}/xci/var/{{ ansible_os_family }}.yml" - - "{{ XCI_PATH }}/xci/file/{{ XCI_FLAVOR }}/flavor-vars.yml" + - "{{ XCI_FLAVOR_ANSIBLE_FILE_PATH }}/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/var/opnfv.yml b/xci/var/opnfv.yml index 6d288338..d3f6bf31 100644 --- a/xci/var/opnfv.yml +++ b/xci/var/opnfv.yml @@ -33,6 +33,7 @@ XCI_SSL_SUBJECT: "{{ lookup('env', 'XCI_SSL_SUBJECT') }}" XCI_CEPH_ENABLED: "{{ lookup('env', 'XCI_CEPH_ENABLED') }}" RUN_TEMPEST: "{{ lookup('env', 'RUN_TEMPEST') }}" DEPLOY_SCENARIO: "{{ lookup('env','DEPLOY_SCENARIO') }}" +XCI_NFVI: "{{ lookup('env','XCI_NFVI') }}" # install docker on opnfv host only if we are running as part of CI opnfv_required_packages: diff --git a/xci/xci-deploy.sh b/xci/xci-deploy.sh index 89fb455b..fa03ef8d 100755 --- a/xci/xci-deploy.sh +++ b/xci/xci-deploy.sh @@ -99,7 +99,7 @@ echo "-------------------------------------------------------------------------" #------------------------------------------------------------------------------- echo "Info: Installing Ansible from pip" echo "-------------------------------------------------------------------------" -source file/install-ansible.sh +source files/install-ansible.sh echo "-------------------------------------------------------------------------" # Make the VMs match the host. If we need to make this configurable @@ -136,7 +136,7 @@ fi #------------------------------------------------------------------------------- # This playbook # - removes existing scenario roles -# - clones OPNFV scenario roles based on the file/opnfv-scenario-requirements.yml file +# - clones OPNFV scenario roles based on the xci/opnfv-scenario-requirements.yml file #------------------------------------------------------------------------------- echo "Info: Cloning OPNFV scenario repositories" echo "-------------------------------------------------------------------------" -- 2.16.6