diff options
| author |   Markos Chandras <mchandras@suse.de> | 2016-11-18 16:34:02 +0000 |
|---|---|---|
| committer | Markos Chandras <mchandras@suse.de> | 2016-11-28 21:12:51 +0000 |
| commit | b0a9b75e7481a24676c9488f17583c13b8b8026e (patch) | |
| tree | 42daa5c28e1337c79ca5f4b6107ba2730e86d932 | |
| parent | a3a94ffd4a58d4ac8fd837e22605b5083f2127ca (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-- | jjb/infra/bifrost-verify-jobs.yml | 10 | ||||
| -rw-r--r-- | prototypes/bifrost/playbooks/test-bifrost-infracloud.yaml | 3 | ||||
| -rwxr-xr-x | prototypes/bifrost/scripts/test-bifrost-deployment.sh | 3 |
3 files changed, 13 insertions, 3 deletions
diff --git a/jjb/infra/bifrost-verify-jobs.yml b/jjb/infra/bifrost-verify-jobs.yml index 751aa0c4a..b1fa02b6d 100644 --- a/jjb/infra/bifrost-verify-jobs.yml +++ b/jjb/infra/bifrost-verify-jobs.yml @@ -24,17 +24,20 @@ disabled: false dib-os-release: 'trusty' dib-os-element: 'ubuntu-minimal' - dib-os-packages: 'openssh-server,vlan,vim,less,bridge-utils,language-pack-en,iputils-ping,rsyslog,curl' + dib-os-packages: 'vlan,vim,less,bridge-utils,language-pack-en,iputils-ping,rsyslog,curl' + extra-dib-elements: 'openssh-server' - 'centos7': disabled: false dib-os-release: '7' dib-os-element: 'centos7' - dib-os-packages: 'openssh-server,vim,less,bridge-utils,iputils,rsyslog,curl' + dib-os-packages: 'vim,less,bridge-utils,iputils,rsyslog,curl' + extra-dib-elements: 'openssh-server' - 'suse': disabled: true dib-os-release: 'suse' dib-os-element: 'suse' dib-os-packages: '' + extra-dib-elements: 'openssh-server' #-------------------------------- # type #-------------------------------- @@ -82,6 +85,9 @@ name: DIB_OS_ELEMENT default: '{dib-os-element}' - string: + name: EXTRA_DIB_ELEMENTS + default: '{extra-dib-elements}' + - string: name: DIB_OS_PACKAGES default: '{dib-os-packages}' - string: diff --git a/prototypes/bifrost/playbooks/test-bifrost-infracloud.yaml b/prototypes/bifrost/playbooks/test-bifrost-infracloud.yaml index a0bc28506..541a1f7d4 100644 --- a/prototypes/bifrost/playbooks/test-bifrost-infracloud.yaml +++ b/prototypes/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/prototypes/bifrost/scripts/test-bifrost-deployment.sh b/prototypes/bifrost/scripts/test-bifrost-deployment.sh index 32a066388..63d851438 100755 --- a/prototypes/bifrost/scripts/test-bifrost-deployment.sh +++ b/prototypes/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 |