openstack/project-config
Code Issues Proposed changes

Merge "Remove node-devstack from nodepool"

Browse Source
This commit is contained in:
Jenkins 2016-06-17 17:38:28 +00:00 committed by Gerrit Code Review
commit a6c8ca5df0
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
nodepool/nodepool.yaml
View File

@ -628,7 +628,7 @@ diskimages:
- simple-init - simple-init
- openstack-repos - openstack-repos
- nodepool-base - nodepool-base
- node-devstack - cache-devstack
- cache-bindep - cache-bindep
- growroot - growroot
- infra-package-needs - infra-package-needs
@ -647,7 +647,7 @@ diskimages:
- simple-init - simple-init
- openstack-repos - openstack-repos
- nodepool-base - nodepool-base
- node-devstack - cache-devstack
- cache-bindep - cache-bindep
- growroot - growroot
- infra-package-needs - infra-package-needs
@ -665,7 +665,7 @@ diskimages:
- simple-init - simple-init
- openstack-repos - openstack-repos
- nodepool-base - nodepool-base
- node-devstack - cache-devstack
- cache-bindep - cache-bindep
- growroot - growroot
- infra-package-needs - infra-package-needs
@ -683,7 +683,7 @@ diskimages:
- simple-init - simple-init
- openstack-repos - openstack-repos
- nodepool-base - nodepool-base
- node-devstack - cache-devstack
- cache-bindep - cache-bindep
- growroot - growroot
- infra-package-needs - infra-package-needs
@ -701,7 +701,7 @@ diskimages:
- simple-init - simple-init
- openstack-repos - openstack-repos
- nodepool-base - nodepool-base
- node-devstack - cache-devstack
- puppet - puppet
- cache-bindep - cache-bindep
- growroot - growroot
@ -718,7 +718,7 @@ diskimages:
- simple-init - simple-init
- openstack-repos - openstack-repos
- nodepool-base - nodepool-base
- node-devstack - cache-devstack
- puppet - puppet
- cache-bindep - cache-bindep
- growroot - growroot

2
tools/build-image.sh
View File

@ -30,4 +30,4 @@ export CONFIG_REF=${CONFIG_REF:-master}
export EXTRA_ELEMENTS=${EXTRA_ELEMENTS:-} export EXTRA_ELEMENTS=${EXTRA_ELEMENTS:-}
disk-image-create -x --no-tmpfs -o $IMAGE_NAME $DISTRO \ disk-image-create -x --no-tmpfs -o $IMAGE_NAME $DISTRO \
vm openstack-repos puppet nodepool-base node-devstack simple-init $EXTRA_ELEMENTS vm openstack-repos puppet nodepool-base cache-devstack simple-init $EXTRA_ELEMENTS