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
This commit is contained in:
Ian Main 2017-06-30 18:30:33 -04:00 committed by Dan Prince
parent 782f68c8fd
commit 8a305da32a
5 changed files with 19 additions and 51 deletions

View File

@ -1,14 +1,5 @@
heat_template_version: pike
parameters:
DockerNamespace:
type: string
default: tripleoupstream
description: namespace
DockerNamespaceIsRegistry:
type: boolean
default: false
resources:
userdata:
@ -21,12 +12,7 @@ resources:
type: OS::Heat::SoftwareConfig
properties:
group: script
config:
str_replace:
params:
$docker_registry: {get_param: DockerNamespace}
$docker_namespace_is_registry: {get_param: DockerNamespaceIsRegistry}
template: {get_file: ./setup_docker_host.sh}
config: {get_file: ./setup_docker_host.sh}
outputs:
OS::stack_id:

View File

@ -4,17 +4,11 @@ description: >
OpenStack containerized Manila Share service
parameters:
DockerNamespace:
description: namespace
default: 'tripleoupstream'
type: string
DockerManilaShareImage:
description: image
default: 'centos-binary-manila-share:latest'
type: string
DockerManilaConfigImage:
description: image
default: 'centos-binary-manila-base:latest'
type: string
EndpointMap:
default: {}
@ -72,10 +66,7 @@ outputs:
config_volume: manila
puppet_tags: manila_config
step_config: *step_config
config_image:
list_join:
- '/'
- [ {get_param: DockerNamespace}, {get_param: DockerManilaConfigImage} ]
config_image: {get_param: DockerManilaConfigImage}
kolla_config:
/var/lib/kolla/config_files/manila_share.json:
command: /usr/bin/manila-share --config-file /usr/share/manila/manila-dist.conf --config-file /etc/manila/manila.conf
@ -96,10 +87,7 @@ outputs:
docker_config:
step_4:
manila_share:
image: &manila_share_image
list_join:
- '/'
- [ {get_param: DockerNamespace}, {get_param: DockerManilaShareImage} ]
image: &manila_share_image {get_param: DockerManilaShareImage}
net: host
restart: always
volumes:

View File

@ -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

View File

@ -59,6 +59,7 @@ parameter_defaults:
DockerManilaApiImage: tripleoupstream/centos-binary-manila-api:latest
DockerManilaConfigImage: tripleoupstream/centos-binary-manila-api:latest
DockerManilaSchedulerImage: tripleoupstream/centos-binary-manila-scheduler:latest
DockerManilaShareImage: tripleoupstream/centos-binary-manila-share:latest
DockerMemcachedConfigImage: tripleoupstream/centos-binary-memcached:latest
DockerMemcachedImage: tripleoupstream/centos-binary-memcached:latest
DockerMistralApiImage: tripleoupstream/centos-binary-mistral-api:latest
@ -99,6 +100,8 @@ parameter_defaults:
DockerOctaviaHealthManagerImage: tripleoupstream/centos-binary-octavia-health-manager:latest
DockerOctaviaHousekeepingImage: tripleoupstream/centos-binary-octavia-housekeeping:latest
DockerOctaviaWorkerImage: tripleoupstream/centos-binary-octavia-worker:latest
DockerOpendaylightApiImage: tripleoupstream/centos-binary-opendaylight:latest
DockerOpendaylightConfigImage: tripleoupstream/centos-binary-opendaylight:latest
DockerOpenvswitchImage: tripleoupstream/centos-binary-neutron-openvswitch-agent:latest
DockerPankoApiImage: tripleoupstream/centos-binary-panko-api:latest
DockerPankoConfigImage: tripleoupstream/centos-binary-panko-api:latest

View File

@ -4,13 +4,11 @@ description: >
Configures docker on the host
parameters:
DockerNamespace:
description: namespace
default: tripleoupstream
DockerInsecureRegistryAddress:
description: Optional. The IP Address and Port of an insecure docker
namespace that will be configured in /etc/sysconfig/docker.
type: string
DockerNamespaceIsRegistry:
type: boolean
default: false
default: ''
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
@ -38,14 +36,19 @@ parameters:
description: Parameters specific to the role
type: json
conditions:
insecure_registry_is_empty: {equals : [{get_param: DockerInsecureRegistryAddress}, '']}
outputs:
role_data:
description: Role data for the docker service
value:
service_name: docker
config_settings:
tripleo::profile::base::docker::docker_namespace: {get_param: DockerNamespace}
tripleo::profile::base::docker::insecure_registry: {get_param: DockerNamespaceIsRegistry}
if:
- insecure_registry_is_empty
- {}
- tripleo::profile::base::docker::insecure_registry_address: {get_param: DockerInsecureRegistryAddress}
step_config: |
include ::tripleo::profile::base::docker
upgrade_tasks: