diff options
| -rw-r--r-- | docker/compute-post.yaml | 38 | ||||
| -rw-r--r-- | docker/firstboot/install_docker_agents.yaml | 8 | ||||
| -rw-r--r-- | docker/firstboot/start_docker_agents.sh | 4 | ||||
| -rw-r--r-- | environments/docker-rdo.yaml | 20 |
4 files changed, 55 insertions, 15 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 diff --git a/docker/firstboot/install_docker_agents.yaml b/docker/firstboot/install_docker_agents.yaml index 8adc8939..22a8ff92 100644 --- a/docker/firstboot/install_docker_agents.yaml +++ b/docker/firstboot/install_docker_agents.yaml @@ -4,6 +4,12 @@ parameters: DockerAgentImage: type: string default: dprince/heat-docker-agents-centos + DockerNamespace: + type: string + default: kollaglue + DockerNamespaceIsRegistry: + type: boolean + default: false resources: @@ -21,6 +27,8 @@ resources: str_replace: params: $agent_image: {get_param: DockerAgentImage} + $docker_registry: {get_param: DockerNamespace} + $docker_namespace_is_registry: {get_param: DockerNamespaceIsRegistry} template: {get_file: ./start_docker_agents.sh} outputs: diff --git a/docker/firstboot/start_docker_agents.sh b/docker/firstboot/start_docker_agents.sh index cb7c57ff..29b039aa 100644 --- a/docker/firstboot/start_docker_agents.sh +++ b/docker/firstboot/start_docker_agents.sh @@ -38,7 +38,9 @@ EOF #echo "ADD_REGISTRY='--registry-mirror $docker_registry'" >> /etc/sysconfig/docker # Local docker registry 1.8 -#/bin/sed -i s/ADD_REGISTRY/#ADD_REGISTRY/ /etc/sysconfig/docker +if [ $docker_namespace_is_registry ]; then + /bin/sed -i "s/# INSECURE_REGISTRY='--insecure-registry '/INSECURE_REGISTRY='--insecure-registry $docker_registry'/g" /etc/sysconfig/docker +fi /sbin/setenforce 0 /sbin/modprobe ebtables diff --git a/environments/docker-rdo.yaml b/environments/docker-rdo.yaml index 5c9f1cb2..0fe5baf8 100644 --- a/environments/docker-rdo.yaml +++ b/environments/docker-rdo.yaml @@ -9,10 +9,16 @@ parameters: # FIXME: When Kolla cuts liberty tag we can use kollaglue registry parameter_defaults: - DockerComputeImage: rthallisey/centos-binary-nova-compute:liberty - DockerComputeDataImage: rthallisey/centos-binary-data:liberty - DockerLibvirtImage: rthallisey/centos-binary-nova-libvirt:liberty - DockerNeutronAgentImage: rthallisey/centos-binary-neutron-agents:liberty - DockerOpenvswitchImage: rthallisey/centos-binary-neutron-openvswitch-agent:liberty - DockerOvsVswitchdImage: rthallisey/centos-binary-openvswitch-vswitchd:liberty - DockerOpenvswitchDBImage: rthallisey/centos-binary-openvswitch-db-server:liberty + # Defaults to kollaglue. Specify a local docker registry + # Example: 192.168.122.131:8787 + DockerNamespace: kollaglue + # Enable local Docker registry + DockerNamespaceIsRegistry: false + # Compute Node Images + DockerComputeImage: centos-binary-nova-compute:liberty + DockerComputeDataImage: centos-binary-data:liberty + DockerLibvirtImage: centos-binary-nova-libvirt:liberty + DockerNeutronAgentImage: centos-binary-neutron-agents:liberty + DockerOpenvswitchImage: centos-binary-neutron-openvswitch-agent:liberty + DockerOvsVswitchdImage: centos-binary-openvswitch-vswitchd:liberty + DockerOpenvswitchDBImage: centos-binary-openvswitch-db-server:liberty |