diff options
author | Ian Main <imain@redhat.com> | 2017-06-30 18:30:33 -0400 |
---|---|---|
committer | Dan Prince <dprince@redhat.com> | 2017-07-20 16:15:21 -0400 |
commit | 8a305da32aaff257e01691e7d0f61abb4ed75bf3 (patch) | |
tree | 7127631f73ffb8decb4dd5d37ce6463ed166cbba /docker/services/opendaylight-api.yaml | |
parent | 782f68c8fd6df1c3ee00fd19d5a8ff9447689d72 (diff) |
Remove DockerNamespace references
This patch removes more of the DockerNamespace references as part
of the cleanup/reorg of the container configuration patches.
This also adds a centos-rdo environment file for use with
the new interface. This file was generated with the command
"openstack overcloud container image prepare"
Depends-On: I729fa00175cb36b02b882d729aae5ff06d0e3fbc
Depends-On: I292162d66880278de09f7acbdbf02e2312c5bb2b
Co-Authored-By: Dan Prince <dprince@redhat.com>
Change-Id: Ice7b57c25248634240a6dd6e14e6d411e7806326
Diffstat (limited to 'docker/services/opendaylight-api.yaml')
-rw-r--r-- | docker/services/opendaylight-api.yaml | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/docker/services/opendaylight-api.yaml b/docker/services/opendaylight-api.yaml index 7d7892dd..80ca822b 100644 --- a/docker/services/opendaylight-api.yaml +++ b/docker/services/opendaylight-api.yaml @@ -4,17 +4,11 @@ description: > OpenStack containerized OpenDaylight API service parameters: - DockerNamespace: - description: namespace - default: 'tripleoupstream' - type: string DockerOpendaylightApiImage: description: image - default: 'centos-binary-opendaylight:latest' type: string DockerOpendaylightConfigImage: description: image - default: 'centos-binary-opendaylight:latest' type: string EndpointMap: default: {} @@ -77,10 +71,7 @@ outputs: # 'file,concat,file_line,augeas' are included by default puppet_tags: odl_user,tripleo::profile::base::neutron::opendaylight::configure_cluster step_config: *step_config - config_image: - list_join: - - '/' - - [ {get_param: DockerNamespace}, {get_param: DockerOpendaylightConfigImage} ] + config_image: {get_param: DockerOpendaylightConfigImage} kolla_config: /var/lib/kolla/config_files/opendaylight_api.json: command: /opt/opendaylight/bin/karaf @@ -97,10 +88,7 @@ outputs: step_1: opendaylight_api: start_order: 0 - image: &odl_api_image - list_join: - - '/' - - [ {get_param: DockerNamespace}, {get_param: DockerOpendaylightApiImage} ] + image: &odl_api_image {get_param: DockerOpendaylightApiImage} privileged: false net: host detach: true |