diff options
| -rwxr-xr-x | xci/config/pinned-versions | 1 | ||||
| -rwxr-xr-x | xci/config/user-vars | 8 | ||||
| -rw-r--r-- | xci/installer/osh/playbooks/install-openstack-helm.yml | 5 | ||||
| -rw-r--r-- | xci/installer/osh/playbooks/roles/install-osh-mini/tasks/main.yml | 17 | ||||
| -rw-r--r-- | xci/installer/osh/playbooks/roles/prepare-opnfvhost-osh/vars/main.yml | 2 | ||||
| -rw-r--r-- | xci/opnfv-scenario-requirements.yml | 2 | ||||
| -rw-r--r-- | xci/playbooks/configure-localhost.yml | 15 | ||||
| -rw-r--r-- | xci/var/opnfv.yml | 2 |
8 files changed, 50 insertions, 2 deletions
diff --git a/xci/config/pinned-versions b/xci/config/pinned-versions index f58ce964..e40cf442 100755 --- a/xci/config/pinned-versions +++ b/xci/config/pinned-versions @@ -37,6 +37,7 @@ export BIFROST_IRONIC_INSPECTOR_VERSION=${BIFROST_IRONIC_INSPECTOR_VERSION:-"0b3 export BIFROST_IRONIC_INSPECTOR_CLIENT_VERSION=${BIFROST_IRONIC_INSPECTOR_CLIENT_VERSION:-"81ae133bd570ea7359b4797ee5699d2d4233b445"} # HEAD of osa "stable/rocky" as of 04.01.2019 export OPENSTACK_OSA_VERSION=${OPENSTACK_OSA_VERSION:-"2087cd98f28b35f655ca398d25d2a6c71e38328e"} +export OPENSTACK_OSH_VERSION="rocky" # HEAD of osh "master" as of 17.07.2019 export OSH_VERSION=${OSH_VERSION:-"dadf9946e076df2b09556f4a18107dc487788cdd"} # HEAD of osh-infra "master" as of 16.07.2019 diff --git a/xci/config/user-vars b/xci/config/user-vars index 951688af..d3d7b2f1 100755 --- a/xci/config/user-vars +++ b/xci/config/user-vars @@ -34,6 +34,14 @@ export XCI_CEPH_ENABLED=${XCI_CEPH_ENABLED:-false} # export INSTALLER_TYPE="kubespray" export INSTALLER_TYPE=${INSTALLER_TYPE:-osa} +#Wait upstream in openstack-helm (OSH) to support opensuse +if [ "$XCI_DISTRO" == "opensuse" ] && [ "$INSTALLER_TYPE" == "osh" ]; then + export XCI_DISTRO=ubuntu-bionic + export OSH_DISTRO=opensuse +elif [ "$XCI_DISTRO" == "ubuntu" ] && [ "$INSTALLER_TYPE" == "osh" ]; then + export OSH_DISTRO=ubuntu +fi + #------------------------------------------------------------------------------- # Set DEPLOYMENT #------------------------------------------------------------------------------- diff --git a/xci/installer/osh/playbooks/install-openstack-helm.yml b/xci/installer/osh/playbooks/install-openstack-helm.yml index 10d8d6d4..a16572a5 100644 --- a/xci/installer/osh/playbooks/install-openstack-helm.yml +++ b/xci/installer/osh/playbooks/install-openstack-helm.yml @@ -11,11 +11,14 @@ remote_user: root vars_files: - "{{ xci_path }}/xci/var/opnfv.yml" - roles: - role: prepare-opnfvhost-osh - role: prepare-osh - role: install-osh-mini when: xci_flavor == 'mini' + environment: + - CONTAINER_DISTRO_NAME: "{{ container_distro_name }}" + - CONTAINER_DISTRO_VERSION: "{{ container_distro_version }}" + - OPENSTACK_RELEASE: "{{ openstack_osh_version }}" - role: install-osh-noha when: xci_flavor == 'noha' diff --git a/xci/installer/osh/playbooks/roles/install-osh-mini/tasks/main.yml b/xci/installer/osh/playbooks/roles/install-osh-mini/tasks/main.yml index c9d23dd1..e3fa2ddf 100644 --- a/xci/installer/osh/playbooks/roles/install-osh-mini/tasks/main.yml +++ b/xci/installer/osh/playbooks/roles/install-osh-mini/tasks/main.yml @@ -1,3 +1,20 @@ +--- +- set_fact: + container_distro_name: "opensuse" + container_distro_version: "15" + cacheable: yes + when: osh_distro == 'opensuse' + tags: + - skip_ansible_lint + +- set_fact: + container_distro_name: "ubuntu" + container_distro_version: "xenial" + cacheable: yes + when: osh_distro == 'ubuntu' + tags: + - skip_ansible_lint + - name: Setup Clients command: ./tools/deployment/common/setup-client.sh changed_when: false diff --git a/xci/installer/osh/playbooks/roles/prepare-opnfvhost-osh/vars/main.yml b/xci/installer/osh/playbooks/roles/prepare-opnfvhost-osh/vars/main.yml index d42392ef..53188bdb 100644 --- a/xci/installer/osh/playbooks/roles/prepare-opnfvhost-osh/vars/main.yml +++ b/xci/installer/osh/playbooks/roles/prepare-opnfvhost-osh/vars/main.yml @@ -1,7 +1,7 @@ +--- required_packages: - patch - ipcalc - jq - nmap - bc - diff --git a/xci/opnfv-scenario-requirements.yml b/xci/opnfv-scenario-requirements.yml index 3fd0377a..f509494f 100644 --- a/xci/opnfv-scenario-requirements.yml +++ b/xci/opnfv-scenario-requirements.yml @@ -155,6 +155,8 @@ - noha distros: - ubuntu + - opensuse + - ubuntu-bionic - scenario: k8-flannel-nofeature scm: git diff --git a/xci/playbooks/configure-localhost.yml b/xci/playbooks/configure-localhost.yml index a84f1aa0..7aab18f3 100644 --- a/xci/playbooks/configure-localhost.yml +++ b/xci/playbooks/configure-localhost.yml @@ -99,3 +99,18 @@ args: executable: /bin/bash creates: "{{ xci_path }}/.cache/xci.env" + + #TODO: Create an Ansible variable for + # kube_service_addresses(10.233.0.0/18) + - name: Update iptables + command: "iptables -t nat -I POSTROUTING 3 -s 192.168.122.0/24 -d 10.233.0.0/18 -j RETURN" + become: true + tags: + - skip_ansible_lint + + #Provide access to the external network (for tests) + - name: Update iptables + command: "iptables -t nat -I POSTROUTING 3 -s 192.168.122.0/24 -d 172.24.4.0/24 -j RETURN" + become: true + tags: + - skip_ansible_lint diff --git a/xci/var/opnfv.yml b/xci/var/opnfv.yml index 62ac9fdf..8e4f9b8d 100644 --- a/xci/var/opnfv.yml +++ b/xci/var/opnfv.yml @@ -37,6 +37,7 @@ osh_infra_git_url: "{{ lookup('env','OSH_INFRA_GIT_URL') }}" osh_infra_version: "{{ lookup('env','OSH_INFRA_VERSION') }}" osh_helm_binary_url: "{{ lookup('env','OSH_HELM_BINARY_URL') }}" osh_helm_binary_version: "{{ lookup('env','OSH_HELM_BINARY_VERSION') }}" +openstack_osh_version: "{{ lookup('env','OPENSTACK_OSH_VERSION') }}" # variables for other components keepalived_git_url: "{{ lookup('env','KEEPALIVED_GIT_URL') }}" @@ -57,6 +58,7 @@ run_tempest: "{{ lookup('env', 'RUN_TEMPEST') }}" core_openstack_install: "{{ lookup('env', 'CORE_OPENSTACK_INSTALL') }}" deploy_scenario: "{{ lookup('env','DEPLOY_SCENARIO') }}" installer_type: "{{ lookup('env','INSTALLER_TYPE') }}" +osh_distro: "{{ lookup('env', 'OSH_DISTRO') }}" # baremetal variables baremetal: "{{ lookup('env','BAREMETAL') }}" |