diff options
| author |   Markos Chandras <mchandras@suse.de> | 2016-11-18 16:34:02 +0000 |
|---|---|---|
| committer |   Trevor Bramwell <tbramwell@linuxfoundation.org> | 2017-08-11 12:56:12 -0700 |
| commit | 2b525d756cf8f3de69d2533905573d80e8f9d8d9 (patch) | |
| tree | e611f0e4e39fb2f2c0d0f5c560d38222157481c0 | |
| parent | 99f34ed29c742850e1aa4237a3d0d2ce3120c614 (diff) | |
bifrost: Make use of the new 'openssh-server' dib element
Make use of the new 'openssh-server' dib element to achieve a consistent
behavior of ssh server across all distributions.
Change-Id: Ib10066a244fe44530969702cd465cdd79454b8fe
Signed-off-by: Markos Chandras <mchandras@suse.de>
| -rw-r--r-- | bifrost/playbooks/test-bifrost-infracloud.yaml | 3 | ||||
| -rwxr-xr-x | bifrost/scripts/test-bifrost-deployment.sh | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/bifrost/playbooks/test-bifrost-infracloud.yaml b/bifrost/playbooks/test-bifrost-infracloud.yaml index a0bc2850..541a1f7d 100644 --- a/bifrost/playbooks/test-bifrost-infracloud.yaml +++ b/bifrost/playbooks/test-bifrost-infracloud.yaml @@ -53,7 +53,8 @@ dib_imagename: "{{deploy_image}}" dib_os_element: "{{ lookup('env','DIB_OS_ELEMENT') }}" dib_os_release: "{{ lookup('env', 'DIB_OS_RELEASE') }}" - dib_elements: "vm serial-console simple-init devuser infra-cloud-bridge puppet growroot {{ extra_dib_elements|default('') }}" + extra_dib_elements: "{{ lookup('env', 'EXTRA_DIB_ELEMENTS') | default('') }}" + dib_elements: "vm serial-console simple-init devuser infra-cloud-bridge puppet growroot {{ extra_dib_elements }}" dib_packages: "{{ lookup('env', 'DIB_OS_PACKAGES') }}" when: create_image_via_dib | bool == true and transform_boot_image | bool == false environment: diff --git a/bifrost/scripts/test-bifrost-deployment.sh b/bifrost/scripts/test-bifrost-deployment.sh index 32a06638..63d85143 100755 --- a/bifrost/scripts/test-bifrost-deployment.sh +++ b/bifrost/scripts/test-bifrost-deployment.sh @@ -65,6 +65,9 @@ export DIB_OS_ELEMENT=${DIB_OS_ELEMENT:-ubuntu-minimal} # for centos 7: "openssh-server,vim,less,bridge-utils,iputils,rsyslog,curl" export DIB_OS_PACKAGES=${DIB_OS_PACKAGES:-"openssh-server,vlan,vim,less,bridge-utils,language-pack-en,iputils-ping,rsyslog,curl"} +# Additional dib elements +export EXTRA_DIB_ELEMENTS=${EXTRA_DIB_ELEMENTS:-} + # Source Ansible # NOTE(TheJulia): Ansible stable-1.9 source method tosses an error deep # under the hood which -x will detect, so for this step, we need to suspend |