diff options
| author |   Ryan Hallisey <rhallise@redhat.com> | 2015-10-19 16:19:45 +0000 |
|---|---|---|
| committer | Ryan Hallisey <rhallise@redhat.com> | 2015-11-02 19:36:51 +0000 |
| commit | 092bcd9283db3379cc2ccc50499e7904d9647c25 (patch) | |
| tree | c903d2f7b7931427535c7095c54e4db56bcf81ac /docker/compute-post.yaml | |
| parent | 3a9186d6585d13528bf904a40556242c02ba4233 (diff) | |
Add local docker registry support
Create a set of environment variables that allows us to configure
a docker registry for deployment. This patch assumes there is a
local docker registry already setup with the images loaded in place.
Change-Id: Iaafaf23eb3fa8b24bcd8f73bb38c552bea629607
Signed-off-by: Ian Main <imain@redhat.com>
Co-Authored-By: Ryan Hallisey <rhallise@redhat.com>
Diffstat (limited to 'docker/compute-post.yaml')
| -rw-r--r-- | docker/compute-post.yaml | 38 |
1 files changed, 31 insertions, 7 deletions
diff --git a/docker/compute-post.yaml b/docker/compute-post.yaml index 2a37b62c..5dd88726 100644 --- a/docker/compute-post.yaml +++ b/docker/compute-post.yaml @@ -9,6 +9,9 @@ parameters: NodeConfigIdentifiers: type: json description: Value which changes if the node configuration may need to be re-applied + DockerNamespace: + type: string + default: kollaglue DockerComputeImage: type: string DockerComputeDataImage: @@ -95,7 +98,10 @@ resources: group: docker-compose config: ovsvswitchd: - image: {get_param: DockerOvsVswitchdImage} + image: + list_join: + - '/' + - [ {get_param: DockerNamespace}, {get_param: DockerOvsVswitchdImage} ] container_name: ovs-vswitchd net: host privileged: true @@ -108,7 +114,10 @@ resources: - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS openvswitchdb: - image: {get_param: DockerOpenvswitchDBImage} + image: + list_join: + - '/' + - [ {get_param: DockerNamespace}, {get_param: DockerOpenvswitchDBImage} ] container_name: ovs-db-server net: host restart: always @@ -151,14 +160,20 @@ resources: group: docker-compose config: computedata: - image: {get_param: DockerComputeDataImage} + image: + list_join: + - '/' + - [ {get_param: DockerNamespace}, {get_param: DockerComputeDataImage} ] container_name: computedata volumes: - /var/lib/nova/instances - /var/lib/libvirt libvirt: - image: {get_param: DockerLibvirtImage} + image: + list_join: + - '/' + - [ {get_param: DockerNamespace}, {get_param: DockerLibvirtImage} ] container_name: libvirt net: host pid: host @@ -187,7 +202,10 @@ resources: group: docker-compose config: openvswitch: - image: {get_param: DockerOpenvswitchImage} + image: + list_join: + - '/' + - [ {get_param: DockerNamespace}, {get_param: DockerOpenvswitchImage} ] container_name: openvswitch net: host privileged: true @@ -205,7 +223,10 @@ resources: - computedata neutronagent: - image: {get_param: DockerOpenvswitchImage} + image: + list_join: + - '/' + - [ {get_param: DockerNamespace}, {get_param: DockerOpenvswitchImage} ] container_name: neutronagent net: host pid: host @@ -223,7 +244,10 @@ resources: - computedata novacompute: - image: {get_param: DockerComputeImage} + image: + list_join: + - '/' + - [ {get_param: DockerNamespace}, {get_param: DockerComputeImage} ] container_name: novacompute net: host privileged: true |