diff options
author | wutianwei <wutianwei1@huawei.com> | 2018-01-02 16:49:48 +0800 |
---|---|---|
committer | wutianwei <wutianwei1@huawei.com> | 2018-01-03 10:48:56 +0800 |
commit | b7c67c901075fc44a087f38e6b11fdac0b1d04d8 (patch) | |
tree | e2bd1e1e55241e7a9b009aaae421fa6046d69f82 /xci | |
parent | b6907b858e215f358a16216a5095c9c6ed3520c4 (diff) |
[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 <wutianwei1@huawei.com>
Diffstat (limited to 'xci')
-rwxr-xr-x | xci/config/env-vars | 2 | ||||
-rw-r--r-- | xci/files/install-ansible.sh (renamed from xci/file/install-ansible.sh) | 0 | ||||
-rw-r--r-- | xci/nfvi/osa/files/aio/flavor-vars.yml (renamed from xci/file/aio/flavor-vars.yml) | 0 | ||||
-rw-r--r-- | xci/nfvi/osa/files/aio/inventory (renamed from xci/file/aio/inventory) | 0 | ||||
-rw-r--r-- | xci/nfvi/osa/files/ha/ceph.yml (renamed from xci/file/ha/ceph.yml) | 0 | ||||
-rw-r--r-- | xci/nfvi/osa/files/ha/flavor-vars.yml (renamed from xci/file/ha/flavor-vars.yml) | 0 | ||||
-rw-r--r-- | xci/nfvi/osa/files/ha/inventory (renamed from xci/file/ha/inventory) | 0 | ||||
-rw-r--r-- | xci/nfvi/osa/files/ha/openstack_user_config.yml (renamed from xci/file/ha/openstack_user_config.yml) | 0 | ||||
-rw-r--r-- | xci/nfvi/osa/files/ha/user_ceph.yml (renamed from xci/file/ha/user_ceph.yml) | 0 | ||||
-rw-r--r-- | xci/nfvi/osa/files/ha/user_variables.yml (renamed from xci/file/ha/user_variables.yml) | 0 | ||||
-rw-r--r-- | xci/nfvi/osa/files/ha/user_variables_ceph.yml (renamed from xci/file/ha/user_variables_ceph.yml) | 0 | ||||
-rw-r--r-- | xci/nfvi/osa/files/mini/ceph.yml (renamed from xci/file/mini/ceph.yml) | 0 | ||||
-rw-r--r-- | xci/nfvi/osa/files/mini/flavor-vars.yml (renamed from xci/file/mini/flavor-vars.yml) | 0 | ||||
-rw-r--r-- | xci/nfvi/osa/files/mini/inventory (renamed from xci/file/mini/inventory) | 0 | ||||
-rw-r--r-- | xci/nfvi/osa/files/mini/openstack_user_config.yml (renamed from xci/file/mini/openstack_user_config.yml) | 0 | ||||
-rw-r--r-- | xci/nfvi/osa/files/mini/user_ceph.yml (renamed from xci/file/mini/user_ceph.yml) | 0 | ||||
-rw-r--r-- | xci/nfvi/osa/files/mini/user_variables.yml (renamed from xci/file/mini/user_variables.yml) | 0 | ||||
-rw-r--r-- | xci/nfvi/osa/files/mini/user_variables_ceph.yml (renamed from xci/file/mini/user_variables_ceph.yml) | 0 | ||||
-rw-r--r-- | xci/nfvi/osa/files/noha/ceph.yml (renamed from xci/file/noha/ceph.yml) | 0 | ||||
-rw-r--r-- | xci/nfvi/osa/files/noha/flavor-vars.yml (renamed from xci/file/noha/flavor-vars.yml) | 0 | ||||
-rw-r--r-- | xci/nfvi/osa/files/noha/inventory (renamed from xci/file/noha/inventory) | 0 | ||||
-rw-r--r-- | xci/nfvi/osa/files/noha/openstack_user_config.yml (renamed from xci/file/noha/openstack_user_config.yml) | 0 | ||||
-rw-r--r-- | xci/nfvi/osa/files/noha/user_ceph.yml (renamed from xci/file/noha/user_ceph.yml) | 0 | ||||
-rw-r--r-- | xci/nfvi/osa/files/noha/user_variables.yml (renamed from xci/file/noha/user_variables.yml) | 0 | ||||
-rw-r--r-- | xci/nfvi/osa/files/noha/user_variables_ceph.yml (renamed from xci/file/noha/user_variables_ceph.yml) | 0 | ||||
-rwxr-xr-x | xci/nfvi/osa/nfvi-deploy.sh | 2 | ||||
-rw-r--r-- | xci/nfvi/osa/playbooks/configure-opnfvhost.yml | 12 | ||||
-rw-r--r-- | xci/nfvi/osa/playbooks/configure-targethosts.yml | 6 | ||||
-rw-r--r-- | xci/var/opnfv.yml | 1 | ||||
-rwxr-xr-x | xci/xci-deploy.sh | 4 |
30 files changed, 14 insertions, 13 deletions
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 index 979d9904..979d9904 100644 --- a/xci/file/install-ansible.sh +++ b/xci/files/install-ansible.sh diff --git a/xci/file/aio/flavor-vars.yml b/xci/nfvi/osa/files/aio/flavor-vars.yml index 6ac1e0fe..6ac1e0fe 100644 --- a/xci/file/aio/flavor-vars.yml +++ b/xci/nfvi/osa/files/aio/flavor-vars.yml diff --git a/xci/file/aio/inventory b/xci/nfvi/osa/files/aio/inventory index 9a3dd9ee..9a3dd9ee 100644 --- a/xci/file/aio/inventory +++ b/xci/nfvi/osa/files/aio/inventory diff --git a/xci/file/ha/ceph.yml b/xci/nfvi/osa/files/ha/ceph.yml index 1567c492..1567c492 100644 --- a/xci/file/ha/ceph.yml +++ b/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 index 167502c9..167502c9 100644 --- a/xci/file/ha/flavor-vars.yml +++ b/xci/nfvi/osa/files/ha/flavor-vars.yml diff --git a/xci/file/ha/inventory b/xci/nfvi/osa/files/ha/inventory index 94b1d074..94b1d074 100644 --- a/xci/file/ha/inventory +++ b/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 index 360aa5cb..360aa5cb 100644 --- a/xci/file/ha/openstack_user_config.yml +++ b/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 index 9d5f13a9..9d5f13a9 100644 --- a/xci/file/ha/user_ceph.yml +++ b/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 index 72960a01..72960a01 100644 --- a/xci/file/ha/user_variables.yml +++ b/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 index 8f708990..8f708990 100644 --- a/xci/file/ha/user_variables_ceph.yml +++ b/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 index 5c09b471..5c09b471 100644 --- a/xci/file/mini/ceph.yml +++ b/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 index 0d446ba2..0d446ba2 100644 --- a/xci/file/mini/flavor-vars.yml +++ b/xci/nfvi/osa/files/mini/flavor-vars.yml diff --git a/xci/file/mini/inventory b/xci/nfvi/osa/files/mini/inventory index eb73e5e3..eb73e5e3 100644 --- a/xci/file/mini/inventory +++ b/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 index f9ccee24..f9ccee24 100644 --- a/xci/file/mini/openstack_user_config.yml +++ b/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 index 9d5f13a9..9d5f13a9 100644 --- a/xci/file/mini/user_ceph.yml +++ b/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 index 9ec9e405..9ec9e405 100644 --- a/xci/file/mini/user_variables.yml +++ b/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 index 8f708990..8f708990 100644 --- a/xci/file/mini/user_variables_ceph.yml +++ b/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 index 0deb522e..0deb522e 100644 --- a/xci/file/noha/ceph.yml +++ b/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 index 3c69a34b..3c69a34b 100644 --- a/xci/file/noha/flavor-vars.yml +++ b/xci/nfvi/osa/files/noha/flavor-vars.yml diff --git a/xci/file/noha/inventory b/xci/nfvi/osa/files/noha/inventory index b4f9f6d0..b4f9f6d0 100644 --- a/xci/file/noha/inventory +++ b/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 index fb12655e..fb12655e 100644 --- a/xci/file/noha/openstack_user_config.yml +++ b/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 index 9d5f13a9..9d5f13a9 100644 --- a/xci/file/noha/user_ceph.yml +++ b/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 index 66573428..66573428 100644 --- a/xci/file/noha/user_variables.yml +++ b/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 index 8f708990..8f708990 100644 --- a/xci/file/noha/user_variables_ceph.yml +++ b/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 "-------------------------------------------------------------------------" |