Skip to content

Commit

Permalink
change container names due to renaming and change tag to the current …
Browse files Browse the repository at this point in the history
…latest build

Change-Id: Ifb9bd65b94e8f68143bf1f0c72650dd767a1016e
Partial-Bug: #1744997
  • Loading branch information
Andrey-mp committed Mar 7, 2018
1 parent d578836 commit 7240a36
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 30 deletions.
14 changes: 7 additions & 7 deletions contrail-analytics/values.yaml
@@ -1,12 +1,12 @@
images:
tags:
nodemgr: "docker.io/opencontrail/contrail-nodemgr:5.0.0-20180220070035-centos7-newton"
analytics_api: "docker.io/opencontrail/contrail-analytics-api:5.0.0-20180220070035-centos7-newton"
contrail_collector: "docker.io/opencontrail/contrail-analytics-collector:5.0.0-20180220070035-centos7-newton"
analytics_alarm_gen: "docker.io/opencontrail/contrail-analytics-alarm-gen:5.0.0-20180220070035-centos7-newton"
analytics_query_engine: "docker.io/opencontrail/contrail-analytics-query-engine:5.0.0-20180220070035-centos7-newton"
analytics_snmp_collector: "docker.io/opencontrail/contrail-analytics-snmp-collector:5.0.0-20180220070035-centos7-newton"
contrail_topology: "docker.io/opencontrail/contrail-analytics-topology:5.0.0-20180220070035-centos7-newton"
nodemgr: "docker.io/opencontrailnightly/contrail-nodemgr:newton-master-17"
analytics_api: "docker.io/opencontrailnightly/contrail-analytics-api:newton-master-17"
contrail_collector: "docker.io/opencontrailnightly/contrail-analytics-collector:newton-master-17"
analytics_alarm_gen: "docker.io/opencontrailnightly/contrail-analytics-alarm-gen:newton-master-17"
analytics_query_engine: "docker.io/opencontrailnightly/contrail-analytics-query-engine:newton-master-17"
analytics_snmp_collector: "docker.io/opencontrailnightly/contrail-analytics-snmp-collector:newton-master-17"
contrail_topology: "docker.io/opencontrailnightly/contrail-analytics-topology:newton-master-17"
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1
imagePullPolicy: "IfNotPresent"

Expand Down
22 changes: 11 additions & 11 deletions contrail-controller/values.yaml
@@ -1,15 +1,15 @@
images:
tags:
nodemgr: "docker.io/opencontrail/contrail-nodemgr:5.0.0-20180220070035-centos7-newton"
contrail_control: "docker.io/opencontrail/contrail-controller-control-control:5.0.0-20180220070035-centos7-newton"
control_dns: "docker.io/opencontrail/contrail-controller-control-dns:5.0.0-20180220070035-centos7-newton"
control_named: "docker.io/opencontrail/contrail-controller-control-named:5.0.0-20180220070035-centos7-newton"
config_api: "docker.io/opencontrail/contrail-controller-config-api:5.0.0-20180220070035-centos7-newton"
config_devicemgr: "docker.io/opencontrail/contrail-controller-config-devicemgr:5.0.0-20180220070035-centos7-newton"
config_schema_transformer: "docker.io/opencontrail/contrail-controller-config-schema:5.0.0-20180220070035-centos7-newton"
config_svcmonitor: "docker.io/opencontrail/contrail-controller-config-svcmonitor:5.0.0-20180220070035-centos7-newton"
webui_middleware: "docker.io/opencontrail/contrail-controller-webui-job:5.0.0-20180220070035-centos7-newton"
webui: "docker.io/opencontrail/contrail-controller-webui-web:5.0.0-20180220070035-centos7-newton"
nodemgr: "docker.io/opencontrailnightly/contrail-nodemgr:newton-master-17"
contrail_control: "docker.io/opencontrailnightly/contrail-controller-control-control:newton-master-17"
control_dns: "docker.io/opencontrailnightly/contrail-controller-control-dns:newton-master-17"
control_named: "docker.io/opencontrailnightly/contrail-controller-control-named:newton-master-17"
config_api: "docker.io/opencontrailnightly/contrail-controller-config-api:newton-master-17"
config_devicemgr: "docker.io/opencontrailnightly/contrail-controller-config-devicemgr:newton-master-17"
config_schema_transformer: "docker.io/opencontrailnightly/contrail-controller-config-schema:newton-master-17"
config_svcmonitor: "docker.io/opencontrailnightly/contrail-controller-config-svcmonitor:newton-master-17"
webui_middleware: "docker.io/opencontrailnightly/contrail-controller-webui-job:newton-master-17"
webui: "docker.io/opencontrailnightly/contrail-controller-webui-web:newton-master-17"
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1
imagePullPolicy: "IfNotPresent"

Expand Down Expand Up @@ -97,7 +97,7 @@ manifests:
daemonset_control: true
daemonset_control_only: false
daemonset_webui: true
daemonset_agent: true
daemonset_vrouter: true
service_config_api: true
service_webui: true
ingress_webui: true
Expand Down
8 changes: 4 additions & 4 deletions contrail-thirdparty/values.yaml
@@ -1,10 +1,10 @@
images:
tags:
kafka: "docker.io/opencontrail/contrail-external-kafka:5.0.0-20180220070035-centos7-newton"
cassandra: "docker.io/opencontrail/contrail-external-cassandra:5.0.0-20180220070035-centos7-newton"
kafka: "docker.io/opencontrailnightly/contrail-external-kafka:newton-master-17"
cassandra: "docker.io/opencontrailnightly/contrail-external-cassandra:newton-master-17"
redis: "redis:4.0.2"
zookeeper: "docker.io/opencontrail/contrail-external-zookeeper:5.0.0-20180220070035-centos7-newton"
nodemgr: "docker.io/opencontrail/contrail-nodemgr:5.0.0-20180220070035-centos7-newton"
zookeeper: "docker.io/opencontrailnightly/contrail-external-zookeeper:newton-master-17"
nodemgr: "docker.io/opencontrailnightly/contrail-nodemgr:newton-master-17"
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1

labels:
Expand Down
14 changes: 7 additions & 7 deletions contrail-vrouter/values.yaml
@@ -1,12 +1,12 @@
images:
tags:
nodemgr: "docker.io/opencontrail/contrail-nodemgr:5.0.0-20180220070035-centos7-newton"
build_driver_init: "docker.io/opencontrail/contrail-agent-build-driver-init:5.0.0-20180220070035-ubuntu16-newton"
vrouter_agent: "docker.io/opencontrail/contrail-agent-vrouter:5.0.0-20180220070035-centos7-newton"
vrouter_init_kernel: "docker.io/opencontrail/contrail-agent-vrouter-init-kernel:5.0.0-20180220070035-centos7-newton"
vrouter_dpdk: "docker.io/opencontrail/contrail-agent-vrouter-dpdk:5.0.0-20180220070035-centos7-newton"
vrouter_init_dpdk: "docker.io/opencontrail/contrail-agent-vrouter-init-kernel-dpdk:5.0.0-20180220070035-centos7-newton"
dpdk_watchdog: "docker.io/opencontrail/contrail-agent-net-watchdog:5.0.0-20180220070035-centos7-newton"
nodemgr: "docker.io/opencontrailnightly/contrail-nodemgr:newton-master-17"
build_driver_init: "docker.io/opencontrailnightly/contrail-vrouter-kernel-build-init:newton-master-17"
vrouter_agent: "docker.io/opencontrailnightly/contrail-vrouter-agent:newton-master-17"
vrouter_init_kernel: "docker.io/opencontrailnightly/contrail-vrouter-kernel-init:newton-master-17"
vrouter_dpdk: "docker.io/opencontrailnightly/contrail-vrouter-agent-dpdk:newton-master-17"
vrouter_init_dpdk: "docker.io/opencontrailnightly/contrail-vrouter-kernel-init-dpdk:newton-master-17"
dpdk_watchdog: "docker.io/opencontrailnightly/contrail-vrouter-net-watchdog:newton-master-17"
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1
imagePullPolicy: "IfNotPresent"

Expand Down
2 changes: 1 addition & 1 deletion doc/contrail-osh-aio-install.md
Expand Up @@ -104,7 +104,7 @@ Using below step you can bring an all-in-one cluster with openstack and contrail
--namespace=openstack --set contrail_env.CONTROLLER_NODES=${CONTROLLER_NODE} \
--set manifests.each_container_is_pod=true
# Edit contrail-vrouter/values.yaml and make sure that images.tags.agent_vrouter_init_kernel is right. Image tag name will be different depending upon your linux. Also set the conf.host_os to ubuntu or centos depending on your system
# Edit contrail-vrouter/values.yaml and make sure that images.tags.vrouter_kernel_init is right. Image tag name will be different depending upon your linux. Also set the conf.host_os to ubuntu or centos depending on your system
helm install --name contrail-vrouter ${CHD_PATH}/contrail-vrouter \
--namespace=openstack --set contrail_env.CONTROLLER_NODES=${CONTROLLER_NODE} \
Expand Down

0 comments on commit 7240a36

Please sign in to comment.