diff options
author | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-07-29 22:49:26 +0200 |
---|---|---|
committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-08-01 00:16:27 +0200 |
commit | 8d7128a62cd2f9b3df1d59bf4aa4fa7a387b1679 (patch) | |
tree | 9d6dba2a15d15b7f82668d23373a3ddd28ce9aa9 /mcp/patches/reclass-system-salt-model | |
parent | 9dfd08262dd3cf833c84cd1c7c1b05c25e09862b (diff) |
salt.sh: Drop upstream clone in favor of local git
salt.sh currently clones the full Fuel@OPNFV git repo from upstream
public mirror, preventing us from testing locally edited or new
patches.
Instead, bring back git submodule handling from old f_repos, clone
and patch each submodule locally, then copy the whole parent repo
over to cfg01.
This is also a first step towards implementing offline deploy support.
NOTE: This adds new deploy prerequisite packages:
- git (for submodule clone/update);
- make (for submodule patching);
- rsync (for parent repo replication to cfg01);
NOTE: Parent repository is expected to be a git repo, in order to
work with git submodules.
While at it, perform some minor related changes:
- add deploy artifacts (ISOs, qcow2 files) to .gitignore, also used
to filter-out such files during rsync to cfg01;
- remove obsolete Fuel patches (old f_repos mechanism);
- rename "reclass-system-salt-model" submodule;
Change-Id: I6210d80d41010b2802e4f1b31acf249a18db7963
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'mcp/patches/reclass-system-salt-model')
-rw-r--r-- | mcp/patches/reclass-system-salt-model/0001-Bring-in-opendaylight-support.patch | 106 |
1 files changed, 106 insertions, 0 deletions
diff --git a/mcp/patches/reclass-system-salt-model/0001-Bring-in-opendaylight-support.patch b/mcp/patches/reclass-system-salt-model/0001-Bring-in-opendaylight-support.patch new file mode 100644 index 000000000..15f23db34 --- /dev/null +++ b/mcp/patches/reclass-system-salt-model/0001-Bring-in-opendaylight-support.patch @@ -0,0 +1,106 @@ +From: Michael Polenchuk <mpolenchuk@mirantis.com> +Date: Thu, 29 Jun 2017 12:22:42 +0400 +Subject: [PATCH] Bring in opendaylight support + +Change-Id: I3efec9a8b586a6c75b1c1635ad2a7024d73d9ad2 +--- + neutron/control/opendaylight/cluster.yml | 19 +++++++++++++++++++ + neutron/control/opendaylight/single.yml | 16 ++++++++++++++++ + neutron/gateway/opendaylight/single.yml | 8 ++++++++ + opendaylight/server/single.yml | 2 ++ + .../storage/system/opendaylight_control_single.yml | 15 +++++++++++++++ + 5 files changed, 60 insertions(+) + create mode 100644 neutron/control/opendaylight/cluster.yml + create mode 100644 neutron/control/opendaylight/single.yml + create mode 100644 neutron/gateway/opendaylight/single.yml + create mode 100644 opendaylight/server/single.yml + create mode 100644 reclass/storage/system/opendaylight_control_single.yml + +diff --git a/neutron/control/opendaylight/cluster.yml b/neutron/control/opendaylight/cluster.yml +new file mode 100644 +index 0000000..4133650 +--- /dev/null ++++ b/neutron/control/opendaylight/cluster.yml +@@ -0,0 +1,19 @@ ++classes: ++- service.keepalived.cluster.single ++- service.haproxy.proxy.single ++- service.neutron.control.cluster ++- system.haproxy.proxy.listen.openstack.neutron ++- system.neutron.control.openvswitch.cluster ++parameters: ++ neutron: ++ server: ++ backend: ++ engine: opendaylight ++ host: ${_param:opendaylight_service_host} ++ rest_api_port: 8282 ++ user: admin ++ password: admin ++ ovsdb_connection: tcp:127.0.0.1:6639 ++ mechanism: ++ ovs: ++ driver: opendaylight_v2 +diff --git a/neutron/control/opendaylight/single.yml b/neutron/control/opendaylight/single.yml +new file mode 100644 +index 0000000..19af585 +--- /dev/null ++++ b/neutron/control/opendaylight/single.yml +@@ -0,0 +1,16 @@ ++classes: ++- service.neutron.control.single ++- system.neutron.control.openvswitch.single ++parameters: ++ neutron: ++ server: ++ backend: ++ engine: opendaylight ++ host: ${_param:opendaylight_service_host} ++ rest_api_port: 8282 ++ user: admin ++ password: admin ++ ovsdb_connection: tcp:127.0.0.1:6639 ++ mechanism: ++ ovs: ++ driver: opendaylight_v2 +diff --git a/neutron/gateway/opendaylight/single.yml b/neutron/gateway/opendaylight/single.yml +new file mode 100644 +index 0000000..29c8d95 +--- /dev/null ++++ b/neutron/gateway/opendaylight/single.yml +@@ -0,0 +1,8 @@ ++classes: ++- service.neutron.gateway.single ++parameters: ++ neutron: ++ gateway: ++ backend: ++ engine: opendaylight ++ ovsdb_connection: tcp:127.0.0.1:6639 +diff --git a/opendaylight/server/single.yml b/opendaylight/server/single.yml +new file mode 100644 +index 0000000..3d11872 +--- /dev/null ++++ b/opendaylight/server/single.yml +@@ -0,0 +1,2 @@ ++classes: ++- service.opendaylight.server.single +diff --git a/reclass/storage/system/opendaylight_control_single.yml b/reclass/storage/system/opendaylight_control_single.yml +new file mode 100644 +index 0000000..ad809f5 +--- /dev/null ++++ b/reclass/storage/system/opendaylight_control_single.yml +@@ -0,0 +1,13 @@ ++parameters: ++ _param: ++ opendaylight_control_hostname: odl01 ++ reclass: ++ storage: ++ node: ++ opendaylight_control_node01: ++ name: ${_param:opendaylight_control_hostname} ++ domain: ${_param:cluster_domain} ++ params: ++ salt_master_host: ${_param:reclass_config_master} ++ linux_system_codename: ${_param:linux_system_codename} ++ single_address: ${_param:opendaylight_service_host} |