From 06ccc9f0c3b196831353cd5f5497a0462f8fec57 Mon Sep 17 00:00:00 2001
From: Narinder Gupta <narinder.gupta@canonical.com>
Date: Wed, 31 Aug 2016 23:22:20 -0500
Subject: [PATCH] modfiied the license to Apache for distribution.

Change-Id: Ib5caf4b11f2640bb7f3f023b3e6974c30a2e2341
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
(cherry picked from commit 92c484d833198b037e631416b23e9ee9fe42ff25)
---
 juju/configure-juju-on-openstack | 17 +++++++++--------
 juju/joid-configure-openstack    | 18 +++++++++---------
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/juju/configure-juju-on-openstack b/juju/configure-juju-on-openstack
index 3256439b..1429b544 100755
--- a/juju/configure-juju-on-openstack
+++ b/juju/configure-juju-on-openstack
@@ -4,16 +4,17 @@
 #
 #    Authors: Nicolas Thomss  <nicolas.thomas@canonical.com>
 #
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, version 3 of the License.
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
 #
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
+#       http://www.apache.org/licenses/LICENSE-2.0
 #
-#    You should have received a copy of the GNU General Public License
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
 
 set -ex
 ## TODO use sudo apt-get install python-openstackclient    instead
diff --git a/juju/joid-configure-openstack b/juju/joid-configure-openstack
index 6b439bb8..231e46ac 100755
--- a/juju/joid-configure-openstack
+++ b/juju/joid-configure-openstack
@@ -4,17 +4,17 @@
 #
 #    Authors: Nicolas Thomss  <nicolas.thomas@canonical.com>
 #
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, version 3 of the License.
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
 #
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
+#       http://www.apache.org/licenses/LICENSE-2.0
 #
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
 
 set -ex
 
-- 
2.16.6