diff options
| -rw-r--r-- | xci/opnfv-scenario-requirements.yml | 5 | ||||
| -rw-r--r-- | xci/playbooks/bootstrap-scenarios.yml | 4 | ||||
| -rw-r--r-- | xci/playbooks/get-opnfv-scenario-requirements.yml | 8 | ||||
| -rwxr-xr-x | xci/xci-deploy.sh | 6 |
4 files changed, 15 insertions, 8 deletions
diff --git a/xci/opnfv-scenario-requirements.yml b/xci/opnfv-scenario-requirements.yml index cde6467d..664b020a 100644 --- a/xci/opnfv-scenario-requirements.yml +++ b/xci/opnfv-scenario-requirements.yml @@ -21,4 +21,9 @@ src: https://git.opnfv.org/releng-xci version: master role: xci/scenarios/os-nosdn-ovs/role/os-nosdn-ovs +- scenario: os-odl-nofeature + scm: git + src: https://git.opnfv.org/releng-xci + version: master + role: xci/scenarios/os-odl-nofeature/role/os-odl-nofeature diff --git a/xci/playbooks/bootstrap-scenarios.yml b/xci/playbooks/bootstrap-scenarios.yml index da5baf0f..d7b43dd6 100644 --- a/xci/playbooks/bootstrap-scenarios.yml +++ b/xci/playbooks/bootstrap-scenarios.yml @@ -13,3 +13,7 @@ include_role: name: "os-nosdn-ovs" when: OPNFV_SCENARIO == 'os-nosdn-ovs' +- name: Prepare everything to run the os-odl-nofeature scenario + include_role: + name: "os-odl-nofeature" + when: OPNFV_SCENARIO == 'os-odl-nofeature' diff --git a/xci/playbooks/get-opnfv-scenario-requirements.yml b/xci/playbooks/get-opnfv-scenario-requirements.yml index 1973531b..c59c18f1 100644 --- a/xci/playbooks/get-opnfv-scenario-requirements.yml +++ b/xci/playbooks/get-opnfv-scenario-requirements.yml @@ -46,11 +46,9 @@ delay: "{{ git_clone_retry_delay }}" - name: Plug in the roles to XCI - file: - state: link - src: "{{ item.path | default(scenario_path_default) }}/{{ item.scenario | default(item.src | basename) }}/{{ item.role }}" - dest: "{{ role_path_default }}/{{ item.scenario }}" - force: yes + shell: >- + cp -a {{ item.path | default(scenario_path_default) }}/{{ item.scenario | default(item.src | basename) }}/{{ item.role }} + {{ role_path_default }}/{{ item.scenario }} with_items: "{{ scenarios }}" vars: diff --git a/xci/xci-deploy.sh b/xci/xci-deploy.sh index b2288163..cbc39e27 100755 --- a/xci/xci-deploy.sh +++ b/xci/xci-deploy.sh @@ -328,14 +328,14 @@ OS_USER_CONFIG=$XCI_PATH/xci/file/$XCI_FLAVOR/openstack_user_config.yml python -c \ "import yaml if '$XCI_FLAVOR' is 'aio': - print 'Horizon UI is available at https://192.168.122.2' + print 'Horizon UI is available at https://$OPNFV_HOST_IP' else: host_info = open('$OS_USER_CONFIG', 'r') net_config = yaml.safe_load(host_info) print 'Info: Horizon UI is available at https://{}' \ .format(net_config['global_overrides']['external_lb_vip_address'])" -USERNAME=$(ssh -q root@192.168.122.2 awk "/OS_USERNAME=./" openrc) -PASSWORD=$(ssh -q root@192.168.122.2 awk "/OS_PASSWORD=./" openrc) +USERNAME=$(ssh -q root@$OPNFV_HOST_IP awk "/OS_USERNAME=./" openrc) +PASSWORD=$(ssh -q root@$OPNFV_HOST_IP awk "/OS_PASSWORD=./" openrc) echo "Info: Admin username - ${USERNAME##*=}" echo "Info: Admin password - ${PASSWORD##*=}" echo "Info: It is recommended to change the default password." |