diff options
Diffstat (limited to 'xci')
| -rw-r--r-- | xci/file/aio/configure-opnfvhost.yml | 1 | ||||
| -rw-r--r-- | xci/playbooks/configure-opnfvhost.yml | 12 | ||||
| -rw-r--r-- | xci/var/Debian.yml | 1 | ||||
| -rw-r--r-- | xci/var/RedHat.yml | 1 | ||||
| -rw-r--r-- | xci/var/Suse.yml | 1 | ||||
| -rwxr-xr-x | xci/xci-deploy.sh | 21 |
6 files changed, 37 insertions, 0 deletions
diff --git a/xci/file/aio/configure-opnfvhost.yml b/xci/file/aio/configure-opnfvhost.yml index 5ef19326..535b14dc 100644 --- a/xci/file/aio/configure-opnfvhost.yml +++ b/xci/file/aio/configure-opnfvhost.yml @@ -12,6 +12,7 @@ remote_user: root vars_files: - ../var/opnfv.yml + roles: - { role: clone-repository, project: "openstack/openstack-ansible", repo: "{{ OPENSTACK_OSA_GIT_URL }}", dest: "{{ OPENSTACK_OSA_PATH }}", version: "{{ OPENSTACK_OSA_VERSION }}" } tasks: - name: bootstrap ansible on opnfv host diff --git a/xci/playbooks/configure-opnfvhost.yml b/xci/playbooks/configure-opnfvhost.yml index 067a1176..439201ef 100644 --- a/xci/playbooks/configure-opnfvhost.yml +++ b/xci/playbooks/configure-opnfvhost.yml @@ -140,6 +140,18 @@ content: "{{ xci_ssl_key }}" dest: "/etc/ssl/private/xci.key" become: true + # install docker on opnfv host only if we are running as part of CI + - name: install docker + package: + name: "{{ docker_package_name }}" + state: latest + when: lookup('env', 'JENKINS_HOME') != "" + # install shade on opnfv host only if we are running as part of CI + - name: install shade + pip: + name: shade + state: present + when: lookup('env', 'JENKINS_HOME') != "" - hosts: localhost remote_user: root diff --git a/xci/var/Debian.yml b/xci/var/Debian.yml index 33f11059..16bb879b 100644 --- a/xci/var/Debian.yml +++ b/xci/var/Debian.yml @@ -10,3 +10,4 @@ # this is the interface the VM nodes are connected to libvirt network "default" interface: "ens3" python_crypto_package_name: python-crypto +docker_package_name: docker.io diff --git a/xci/var/RedHat.yml b/xci/var/RedHat.yml index eae7d127..bcd6d044 100644 --- a/xci/var/RedHat.yml +++ b/xci/var/RedHat.yml @@ -9,3 +9,4 @@ ############################################################################## # this is placeholder and left blank intentionally to complete later on python_crypto_package_name: python-crypto +docker_package_name: docker diff --git a/xci/var/Suse.yml b/xci/var/Suse.yml index 786a8751..6b4c76ec 100644 --- a/xci/var/Suse.yml +++ b/xci/var/Suse.yml @@ -10,3 +10,4 @@ # this is the interface the VM nodes are connected to libvirt network "default" interface: "eth0" python_crypto_package_name: python-pycrypto +docker_package_name: docker diff --git a/xci/xci-deploy.sh b/xci/xci-deploy.sh index c985c7dd..95856105 100755 --- a/xci/xci-deploy.sh +++ b/xci/xci-deploy.sh @@ -272,3 +272,24 @@ if grep -q 'failed=1\|unreachable=1' $LOG_PATH/opnfv-setup-openstack.log; then exit 1 fi echo "Info: OpenStack installation is successfully completed!" + +#------------------------------------------------------------------------------- +# - Getting OpenStack login information +#------------------------------------------------------------------------------- +echo "Info: Openstack login details" +echo "-----------------------------------------------------------------------" +OS_USER_CONFIG=$XCI_PATH/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' +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) +echo "Info: Admin username - ${USERNAME##*=}" +echo "Info: Admin password - ${PASSWORD##*=}" +echo "Info: It is recommended to change the default password."
\ No newline at end of file |