Skip to content

Commit f247f94

Browse files
committed
remove override HP for juju
try to work with default value 256 Change-Id: Id27b8965f67389fda78b30c6319344330a59cb16
1 parent 4685979 commit f247f94

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

juju/files/bundle_tf.yaml.tmpl

+6
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ services:
5151
{%- endif %}
5252
expose: true
5353
to: {{ controller_nodes }}
54+
5455
{%- if (LEGACY_ANALYTICS_ENABLE | lower) == 'true' %}
5556
tf-analyticsdb:
5657
charm: "{{ JUJU_REPO }}/contrail-analyticsdb"
@@ -78,6 +79,7 @@ services:
7879
expose: true
7980
to: {{ controller_nodes }}
8081
{%- endif %}
82+
8183
tf-analytics:
8284
charm: "{{ JUJU_REPO }}/contrail-analytics"
8385
series: "{{ UBUNTU_SERIES }}"
@@ -100,6 +102,7 @@ services:
100102
{%- endif %}
101103
expose: true
102104
to: {{ controller_nodes }}
105+
103106
{%- if ENABLE_DPDK_SRIOV.lower() == 'true' %}
104107
tf-agent-dpdk:
105108
charm: "{{ JUJU_REPO }}/contrail-agent"
@@ -154,6 +157,7 @@ services:
154157
num_units: 1
155158
to:
156159
- "0"
160+
157161
tf-openstack:
158162
charm: "{{ JUJU_REPO }}/contrail-openstack"
159163
series: "{{ UBUNTU_SERIES }}"
@@ -166,6 +170,7 @@ services:
166170
docker-registry-insecure: true
167171
image-tag: "{{ CONTRAIL_CONTAINER_TAG }}"
168172
{%- endif %}
173+
169174
{%- if ORCHESTRATOR == 'kubernetes' or ORCHESTRATOR == 'hybrid' %}
170175
tf-kubernetes-master:
171176
series: "{{ UBUNTU_SERIES }}"
@@ -182,6 +187,7 @@ services:
182187
cluster_name: "k8s"
183188
public_fip_pool: "{'domain':'{{ KUBERNETES_CLUSTER_DOMAIN | default('default-domain') }}','project':'{{ KUBERNETES_CLUSTER_PROJECT | default('k8s-default') }}','name':'__fip_pool_public__','network':'__public__'}"
184189
ip_fabric_snat: true
190+
185191
tf-kubernetes-node:
186192
series: "{{ UBUNTU_SERIES }}"
187193
charm: "{{ JUJU_REPO }}/contrail-kubernetes-node"

juju/run.sh

-3
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,6 @@ default_timeout=3000
3434
if [[ "$CLOUD" == 'maas' ]]; then default_timeout=9000 ; fi
3535
export WAIT_TIMEOUT=${WAIT_TIMEOUT:-$default_timeout}
3636

37-
# override for juju
38-
export HUGE_PAGES_2MB=1024
39-
4037
export JUJU_REPO=${JUJU_REPO:-$WORKSPACE/tf-charms}
4138
# cloud local is deprecated, please use CLOUD=manual and unset CONTROLLER_NODES and AGENT_NODES
4239
if [[ $CLOUD == 'local' ]] ; then

0 commit comments

Comments
 (0)