Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[init_cfg.json] Add new FEATURE and CONTAINER_FEATURE tables #4137

Merged
merged 6 commits into from
Feb 11, 2020
Merged

[init_cfg.json] Add new FEATURE and CONTAINER_FEATURE tables #4137

merged 6 commits into from
Feb 11, 2020

Conversation

yozhao101
Copy link
Contributor

Signed-off-by: Yong Zhao yozhao@microsoft.com

- What I did
I created a table named CONTAINER_FEATURE in which the auto-restart feature of each container is
currently set to be "enabled". This table will be used to initialize the Config_DB.

- How I did it

- How to verify it

Signed-off-by: Yong Zhao <yozhao@microsoft.com>
Signed-off-by: Yong Zhao <yozhao@microsoft.com>
files/build_templates/init_cfg.json.j2 Outdated Show resolved Hide resolved
CONTAINER_FEATURE.

Signed-off-by: Yong Zhao <yozhao@microsoft.com>
@jleveque
Copy link
Contributor

jleveque commented Feb 11, 2020

As part of this PR, can you please also add the new "FEATURE" table above the "CONTAINER_FEATURE" table?

    "FEATURE": {
{%- for feature in ["sflow", "telemetry"] %}
        "{{feature}}": {
            "status": "disabled"
        }{% if not loop.last %},{% endif -%}
{% endfor %}
    },

@yozhao101
Copy link
Contributor Author

@jleveque Sure, will update it.

Signed-off-by: Yong Zhao <yozhao@microsoft.com>
files/build_templates/init_cfg.json.j2 Outdated Show resolved Hide resolved
files/build_templates/init_cfg.json.j2 Outdated Show resolved Hide resolved
alphabetical order.

Signed-off-by: Yong Zhao <yozhao@microsoft.com>
files/build_templates/init_cfg.json.j2 Outdated Show resolved Hide resolved
@jleveque jleveque changed the title [init_cfg.json] Add a new table CONTAINER_FEATURE [init_cfg.json] Add new FEATURE and CONTAINER_FEATURE tables Feb 11, 2020
Signed-off-by: Yong Zhao <yozhao@microsoft.com>
@yozhao101 yozhao101 merged commit 41958aa into sonic-net:master Feb 11, 2020
abdosi pushed a commit that referenced this pull request Feb 14, 2020
* [init_cfg.json] Add a new table CONTAINER_FEATURE.

Signed-off-by: Yong Zhao <yozhao@microsoft.com>

* [init_cfg.json] Update the content of table CONTAINER_FEATURE.

Signed-off-by: Yong Zhao <yozhao@microsoft.com>

* [init_cfg.json] Use the template to generate the table
CONTAINER_FEATURE.

Signed-off-by: Yong Zhao <yozhao@microsoft.com>

* [init_cfg.json] Add a new table FEATURE.

Signed-off-by: Yong Zhao <yozhao@microsoft.com>

* [init_cfg.json] Change the order of container names according to
alphabetical order.

Signed-off-by: Yong Zhao <yozhao@microsoft.com>

* [init_cfg.json] Change the dhcp_relay container name and add rest-api.

Signed-off-by: Yong Zhao <yozhao@microsoft.com>
stepanblyschak pushed a commit to stepanblyschak/sonic-buildimage that referenced this pull request Feb 26, 2020
…et#4137)

* [init_cfg.json] Add a new table CONTAINER_FEATURE.

Signed-off-by: Yong Zhao <yozhao@microsoft.com>

* [init_cfg.json] Update the content of table CONTAINER_FEATURE.

Signed-off-by: Yong Zhao <yozhao@microsoft.com>

* [init_cfg.json] Use the template to generate the table
CONTAINER_FEATURE.

Signed-off-by: Yong Zhao <yozhao@microsoft.com>

* [init_cfg.json] Add a new table FEATURE.

Signed-off-by: Yong Zhao <yozhao@microsoft.com>

* [init_cfg.json] Change the order of container names according to
alphabetical order.

Signed-off-by: Yong Zhao <yozhao@microsoft.com>

* [init_cfg.json] Change the dhcp_relay container name and add rest-api.

Signed-off-by: Yong Zhao <yozhao@microsoft.com>

Conflicts:
	files/build_templates/init_cfg.json.j2
pphuchar pushed a commit to SONIC-DEV/sonic-buildimage that referenced this pull request Mar 9, 2020
…et#4137)

* [init_cfg.json] Add a new table CONTAINER_FEATURE.

Signed-off-by: Yong Zhao <yozhao@microsoft.com>

* [init_cfg.json] Update the content of table CONTAINER_FEATURE.

Signed-off-by: Yong Zhao <yozhao@microsoft.com>

* [init_cfg.json] Use the template to generate the table
CONTAINER_FEATURE.

Signed-off-by: Yong Zhao <yozhao@microsoft.com>

* [init_cfg.json] Add a new table FEATURE.

Signed-off-by: Yong Zhao <yozhao@microsoft.com>

* [init_cfg.json] Change the order of container names according to
alphabetical order.

Signed-off-by: Yong Zhao <yozhao@microsoft.com>

* [init_cfg.json] Change the dhcp_relay container name and add rest-api.

Signed-off-by: Yong Zhao <yozhao@microsoft.com>
tiantianlv pushed a commit to SONIC-DEV/sonic-buildimage that referenced this pull request Apr 24, 2020
…et#4137)

* [init_cfg.json] Add a new table CONTAINER_FEATURE.

Signed-off-by: Yong Zhao <yozhao@microsoft.com>

* [init_cfg.json] Update the content of table CONTAINER_FEATURE.

Signed-off-by: Yong Zhao <yozhao@microsoft.com>

* [init_cfg.json] Use the template to generate the table
CONTAINER_FEATURE.

Signed-off-by: Yong Zhao <yozhao@microsoft.com>

* [init_cfg.json] Add a new table FEATURE.

Signed-off-by: Yong Zhao <yozhao@microsoft.com>

* [init_cfg.json] Change the order of container names according to
alphabetical order.

Signed-off-by: Yong Zhao <yozhao@microsoft.com>

* [init_cfg.json] Change the dhcp_relay container name and add rest-api.

Signed-off-by: Yong Zhao <yozhao@microsoft.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants