diff options
author | Yolanda Robla <yroblamo@redhat.com> | 2017-08-16 16:28:28 +0200 |
---|---|---|
committer | Yolanda Robla Mota <info@ysoft.biz> | 2017-09-14 20:13:00 +0000 |
commit | d08ce6dfd4df2574be8f69419f5e5c027cae6d2a (patch) | |
tree | 33f601c8eb151cba1c7eef066fccbe2aee69af5d /xci/config | |
parent | 890763baf32de0bab7985b55fe9f8d7c59c48dc0 (diff) |
Generate and use certificates for OSA
Instead of making OSA to generate self signed certs, bring our
own and pass them.
By this way we will be able to trust in that certs, and start
consuming OpenStack easily.
It will also generate proper openrc file to source it and start
consuming the cloud properly.
Change-Id: Ic72a8b05e6efb222926fc5fa0800e033b2dbd22f
Closes-Bug: RELENG-266
Signed-off-by: Yolanda Robla <yroblamo@redhat.com>
Diffstat (limited to 'xci/config')
-rwxr-xr-x | xci/config/env-vars | 3 | ||||
-rwxr-xr-x | xci/config/user-vars | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/xci/config/env-vars b/xci/config/env-vars index f4a3facc..976eb66b 100755 --- a/xci/config/env-vars +++ b/xci/config/env-vars @@ -5,6 +5,7 @@ export OPNFV_RELENG_GIT_URL=https://gerrit.opnfv.org/gerrit/releng-xci.git export OPENSTACK_BIFROST_GIT_URL=https://git.openstack.org/openstack/bifrost export OPENSTACK_OSA_GIT_URL=https://git.openstack.org/openstack/openstack-ansible +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 OPNFV_XCI_PATH=$OPNFV_RELENG_PATH/xci @@ -20,3 +21,5 @@ export DIB_OS_RELEASE=${DIB_OS_RELEASE:-xenial} export DIB_OS_ELEMENT=${DIB_OS_ELEMENT:-ubuntu-minimal} export DIB_OS_PACKAGES=${DIB_OS_PACKAGES:-"vlan,vim,less,bridge-utils,sudo,language-pack-en,iputils-ping,rsyslog,curl,python,debootstrap,ifenslave,ifenslave-2.6,lsof,lvm2,tcpdump,nfs-kernel-server,chrony,iptables"} export EXTRA_DIB_ELEMENTS=${EXTRA_DIB_ELEMENTS:-"openssh-server"} +# subject of the certificate +export XCI_SSL_SUBJECT=${XCI_SSL_SUBJECT:-"/C=US/ST=California/L=San Francisco/O=IT/CN=xci.releng.opnfv.org"} diff --git a/xci/config/user-vars b/xci/config/user-vars index c960b904..709aa29e 100755 --- a/xci/config/user-vars +++ b/xci/config/user-vars @@ -30,6 +30,7 @@ export XCI_FLAVOR=${XCI_FLAVOR:-aio} #------------------------------------------------------------------------------- export XCI_DEVEL_ROOT=${XCI_DEVEL_ROOT:-"/tmp/.xci-deploy-env"} export OPNFV_RELENG_PATH="${XCI_DEVEL_ROOT}/releng-xci" +export OPENSTACK_OSA_OPENRC_PATH="${XCI_DEVEL_ROOT}/openstack-ansible-openstack_openrc" export OPENSTACK_BIFROST_PATH="${XCI_DEVEL_ROOT}/bifrost" export OPENSTACK_OSA_PATH="${XCI_DEVEL_ROOT}/openstack-ansible" export OPNFV_SSH_HOST_KEYS_PATH="${XCI_DEVEL_ROOT}/ssh_host_keys" |