From c4b78d1afaf4c4e472a2618c5bfdd4a5d87541f3 Mon Sep 17 00:00:00 2001 From: Daniel Farrell Date: Wed, 17 Jan 2018 05:39:29 -0500 Subject: [PATCH] Remove examples for old ODL versions, add new Also add examples that install from new CD repos. Change-Id: I12b13da6d7eb1c6d8f82fc314724f7b2fbd049d8 Signed-off-by: Daniel Farrell --- ...odl_4_testing_playbook.yml => odl_6_devel_playbook.yml} | 4 ++-- ...odl_5_release_playbook.yml => odl_7_devel_playbook.yml} | 4 ++-- ...l_4_release_playbook.yml => odl_7_release_playbook.yml} | 4 ++-- examples/odl_7_testing_playbook.yml | 7 +++++++ examples/odl_8_devel_playbook.yml | 7 +++++++ ...l_5_testing_playbook.yml => odl_8_testing_playbook.yml} | 4 ++-- 6 files changed, 22 insertions(+), 8 deletions(-) rename examples/{odl_4_testing_playbook.yml => odl_6_devel_playbook.yml} (64%) rename examples/{odl_5_release_playbook.yml => odl_7_devel_playbook.yml} (62%) rename examples/{odl_4_release_playbook.yml => odl_7_release_playbook.yml} (61%) create mode 100644 examples/odl_7_testing_playbook.yml create mode 100644 examples/odl_8_devel_playbook.yml rename examples/{odl_5_testing_playbook.yml => odl_8_testing_playbook.yml} (65%) diff --git a/examples/odl_4_testing_playbook.yml b/examples/odl_6_devel_playbook.yml similarity index 64% rename from examples/odl_4_testing_playbook.yml rename to examples/odl_6_devel_playbook.yml index af6fe58..006621e 100644 --- a/examples/odl_4_testing_playbook.yml +++ b/examples/odl_6_devel_playbook.yml @@ -3,5 +3,5 @@ become: yes roles: - role: opendaylight - # Install the latest ODL Beryllium RPM from the CBS repos - rpm_repo_url: "https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=packages/rpm/example_repo_configs/opendaylight-4-testing.repo" + # Install the latest ODL Carbon RPM from ODL Nexus CD repos + rpm_repo_url: "https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=packages/rpm/example_repo_configs/opendaylight-6-devel.repo" diff --git a/examples/odl_5_release_playbook.yml b/examples/odl_7_devel_playbook.yml similarity index 62% rename from examples/odl_5_release_playbook.yml rename to examples/odl_7_devel_playbook.yml index 33b63de..27fea8d 100644 --- a/examples/odl_5_release_playbook.yml +++ b/examples/odl_7_devel_playbook.yml @@ -3,5 +3,5 @@ become: yes roles: - role: opendaylight - # Install latest service release of ODL Boron RPM from the CBS repos - rpm_repo_url: "https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=packages/rpm/example_repo_configs/opendaylight-5-release.repo" + # Install the latest ODL Nitrogen RPM from ODL Nexus CD repos + rpm_repo_url: "https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=packages/rpm/example_repo_configs/opendaylight-7-devel.repo" diff --git a/examples/odl_4_release_playbook.yml b/examples/odl_7_release_playbook.yml similarity index 61% rename from examples/odl_4_release_playbook.yml rename to examples/odl_7_release_playbook.yml index 191ca03..573f503 100644 --- a/examples/odl_4_release_playbook.yml +++ b/examples/odl_7_release_playbook.yml @@ -3,5 +3,5 @@ become: yes roles: - role: opendaylight - # Install latest service release of ODL Beryllium RPM from the CBS repos - rpm_repo_url: "https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=packages/rpm/example_repo_configs/opendaylight-4-release.repo" + # Install latest service release of ODL Nitrogen RPM from the CBS repos + rpm_repo_url: "https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=packages/rpm/example_repo_configs/opendaylight-7-release.repo" diff --git a/examples/odl_7_testing_playbook.yml b/examples/odl_7_testing_playbook.yml new file mode 100644 index 0000000..8c9a17c --- /dev/null +++ b/examples/odl_7_testing_playbook.yml @@ -0,0 +1,7 @@ +--- +- hosts: all + become: yes + roles: + - role: opendaylight + # Install the latest ODL Nitrogen RPM from the CBS repos + rpm_repo_url: "https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=packages/rpm/example_repo_configs/opendaylight-7-testing.repo" diff --git a/examples/odl_8_devel_playbook.yml b/examples/odl_8_devel_playbook.yml new file mode 100644 index 0000000..cb07ca3 --- /dev/null +++ b/examples/odl_8_devel_playbook.yml @@ -0,0 +1,7 @@ +--- +- hosts: all + become: yes + roles: + - role: opendaylight + # Install the latest ODL Nitrogen RPM from ODL Nexus CD repos + rpm_repo_url: "https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=packages/rpm/example_repo_configs/opendaylight-8-devel.repo" diff --git a/examples/odl_5_testing_playbook.yml b/examples/odl_8_testing_playbook.yml similarity index 65% rename from examples/odl_5_testing_playbook.yml rename to examples/odl_8_testing_playbook.yml index a06674d..5fa99f7 100644 --- a/examples/odl_5_testing_playbook.yml +++ b/examples/odl_8_testing_playbook.yml @@ -3,5 +3,5 @@ become: yes roles: - role: opendaylight - # Install the latest ODL Boron RPM from the CBS repos - rpm_repo_url: "https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=packages/rpm/example_repo_configs/opendaylight-5-testing.repo" + # Install the latest ODL Oxygen RPM from the CBS repos + rpm_repo_url: "https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=packages/rpm/example_repo_configs/opendaylight-8-testing.repo" -- 2.36.6