Change to use brooklyncentral images and BROOKLYN_ env var prefix
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/5a4f2e9b Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/5a4f2e9b Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/5a4f2e9b Branch: refs/heads/master Commit: 5a4f2e9b833e64a6209a5f1eb087551d806ca295 Parents: e0391d0 Author: Andrew Donald Kennedy <[email protected]> Authored: Mon Jun 12 15:13:27 2017 -0400 Committer: Andrew Donald Kennedy <[email protected]> Committed: Mon Jun 12 15:13:27 2017 -0400 ---------------------------------------------------------------------- .../location/docker/DockerJcloudsLocation.java | 24 ++++++++++---------- .../location/kubernetes/ImageChooser.java | 6 ++--- .../location/kubernetes/KubernetesLocation.java | 12 +++++----- .../location/openshift/OpenShiftLocation.java | 4 ++-- .../docker/DockerJcloudsLocationLiveTest.java | 18 +++++++-------- .../location/kubernetes/ImageChooserTest.java | 12 +++++----- .../kubernetes/KubernetesLocationLiveTest.java | 18 +++++++-------- 7 files changed, 47 insertions(+), 47 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/5a4f2e9b/locations/container/src/main/java/org/apache/brooklyn/container/location/docker/DockerJcloudsLocation.java ---------------------------------------------------------------------- diff --git a/locations/container/src/main/java/org/apache/brooklyn/container/location/docker/DockerJcloudsLocation.java b/locations/container/src/main/java/org/apache/brooklyn/container/location/docker/DockerJcloudsLocation.java index 124a191..5b69e74 100644 --- a/locations/container/src/main/java/org/apache/brooklyn/container/location/docker/DockerJcloudsLocation.java +++ b/locations/container/src/main/java/org/apache/brooklyn/container/location/docker/DockerJcloudsLocation.java @@ -53,13 +53,13 @@ import static com.google.common.base.Preconditions.checkNotNull; /** * For provisioning docker containers, using the jclouds-docker integration. * <p> - * This adds special support for default Cloudsoft images. If the image description matches our - * cloudsoft regexes, then auto-generate a password and pass that in as - * {@code CLOUDSOFT_ROOT_PASSWORD} when launching the container. That will then be used as the + * This adds special support for default Docker images. If the image description matches our + * image regexes, then auto-generate a password and pass that in as + * {@code BROOKLYN_ROOT_PASSWORD} when launching the container. That will then be used as the * {@link DockerTemplateOptions#getLoginPassword()}. * <p> - * Also, if no image is specified then this will set the default to "cloudsoft/centos:7" - * (see https://hub.docker.com/r/cloudsoft/centos/). + * Also, if no image is specified then this will set the default to "brooklyncentral/centos:7" + * (see https://hub.docker.com/r/brooklyncentral/centos/). */ public class DockerJcloudsLocation extends JcloudsLocation { @@ -70,19 +70,19 @@ public class DockerJcloudsLocation extends JcloudsLocation { public static final ConfigKey<String> DEFAULT_IMAGE_DESCRIPTION_REGEX = ConfigKeys.newStringConfigKey( "defaultImageDescriptionRegex", "The default image description to use, if no other image preferences are supplied", - "cloudsoft/centos:7"); + "brooklyncentral/centos:7"); private static final Logger LOG = LoggerFactory.getLogger(DockerJcloudsLocation.class); /** * The regex for the image descriptions that support us injecting login credentials. */ private static final List<String> IMAGE_DESCRIPTION_REGEXES_REQUIRING_INJECTED_LOGIN_CREDS = ImmutableList.of( - "cloudsoft/centos.*", - "cloudsoft/ubuntu.*"); + "brooklyncentral/centos.*", + "brooklyncentral/ubuntu.*"); private static final List<ImageMetadata> DEFAULT_IMAGES = ImmutableList.of( - new ImageMetadata(OsFamily.CENTOS, "7", "cloudsoft/centos:7"), - new ImageMetadata(OsFamily.UBUNTU, "14.04", "cloudsoft/ubuntu:14.04"), - new ImageMetadata(OsFamily.UBUNTU, "16.04", "cloudsoft/ubuntu:16.04")); + new ImageMetadata(OsFamily.CENTOS, "7", "brooklyncentral/centos:7"), + new ImageMetadata(OsFamily.UBUNTU, "14.04", "brooklyncentral/ubuntu:14.04"), + new ImageMetadata(OsFamily.UBUNTU, "16.04", "brooklyncentral/ubuntu:16.04")); @Override protected MachineLocation obtainOnce(ConfigBag setup) throws NoMachinesAvailableException { @@ -149,7 +149,7 @@ public class DockerJcloudsLocation extends JcloudsLocation { templateOptions.overrideLoginUser(loginUser); templateOptions.overrideLoginPassword(loginPassword); - env.add("CLOUDSOFT_ROOT_PASSWORD=" + loginPassword); + env.add("BROOKLYN_ROOT_PASSWORD=" + loginPassword); } } http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/5a4f2e9b/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/ImageChooser.java ---------------------------------------------------------------------- diff --git a/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/ImageChooser.java b/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/ImageChooser.java index 5536b82..d38e843 100644 --- a/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/ImageChooser.java +++ b/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/ImageChooser.java @@ -33,9 +33,9 @@ public class ImageChooser { private static final Logger LOG = LoggerFactory.getLogger(ImageChooser.class); private static final List<ImageMetadata> DEFAULT_IMAGES = ImmutableList.of( - new ImageMetadata(OsFamily.CENTOS, "7", "cloudsoft/centos:7"), - new ImageMetadata(OsFamily.UBUNTU, "14.04", "cloudsoft/ubuntu:14.04"), - new ImageMetadata(OsFamily.UBUNTU, "16.04", "cloudsoft/ubuntu:16.04")); + new ImageMetadata(OsFamily.CENTOS, "7", "brooklyncentral/centos:7"), + new ImageMetadata(OsFamily.UBUNTU, "14.04", "brooklyncentral/ubuntu:14.04"), + new ImageMetadata(OsFamily.UBUNTU, "16.04", "brooklyncentral/ubuntu:16.04")); private final List<ImageMetadata> images; public ImageChooser() { http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/5a4f2e9b/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/KubernetesLocation.java ---------------------------------------------------------------------- diff --git a/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/KubernetesLocation.java b/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/KubernetesLocation.java index dfde551..23921f8 100644 --- a/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/KubernetesLocation.java +++ b/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/KubernetesLocation.java @@ -134,7 +134,7 @@ public class KubernetesLocation extends AbstractLocation implements MachineProvi * - Does not create a user, so behaves differently from things that use * JcloudsLocation. * - Does not use ssh keys only passwords. - * - The 'cloudsoft/*' images use root which is discouraged. + * - The 'brooklyncentral/*' images use root which is discouraged. * - Error handling needs revisited. For example, if provisioning fails then * it waits for five minutes and then fails without a reason why. * e.g. try launching a container with an incorrect image name. @@ -153,12 +153,12 @@ public class KubernetesLocation extends AbstractLocation implements MachineProvi * The regex for the image descriptions that support us injecting login credentials. */ public static final List<String> IMAGE_DESCRIPTION_REGEXES_REQUIRING_INJECTED_LOGIN_CREDS = ImmutableList.of( - "cloudsoft/centos.*", - "cloudsoft/ubuntu.*"); + "brooklyncentral/centos.*", + "brooklyncentral/ubuntu.*"); /** * The environment variable for injecting login credentials. */ - public static final String CLOUDSOFT_ROOT_PASSWORD = "CLOUDSOFT_ROOT_PASSWORD"; + public static final String BROOKLYN_ROOT_PASSWORD = "BROOKLYN_ROOT_PASSWORD"; private static final Logger LOG = LoggerFactory.getLogger(KubernetesLocation.class); private KubernetesClient client; @@ -892,7 +892,7 @@ public class KubernetesLocation extends AbstractLocation implements MachineProvi } /** - * Sets the {@code CLOUDSOFT_ROOT_PASSWORD} variable in the container environment if appropriate. + * Sets the {@code BROOKLYN_ROOT_PASSWORD} variable in the container environment if appropriate. * This is (approximately) the same behaviour as the {@link DockerJcloudsLocation} used for * Swarm. * <p> @@ -926,7 +926,7 @@ public class KubernetesLocation extends AbstractLocation implements MachineProvi setup.configure(LOGIN_USER_PASSWORD, loginPassword); } - injections.put(CLOUDSOFT_ROOT_PASSWORD, loginPassword); + injections.put(BROOKLYN_ROOT_PASSWORD, loginPassword); } } http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/5a4f2e9b/locations/container/src/main/java/org/apache/brooklyn/container/location/openshift/OpenShiftLocation.java ---------------------------------------------------------------------- diff --git a/locations/container/src/main/java/org/apache/brooklyn/container/location/openshift/OpenShiftLocation.java b/locations/container/src/main/java/org/apache/brooklyn/container/location/openshift/OpenShiftLocation.java index bcd8a07..abbeb20 100644 --- a/locations/container/src/main/java/org/apache/brooklyn/container/location/openshift/OpenShiftLocation.java +++ b/locations/container/src/main/java/org/apache/brooklyn/container/location/openshift/OpenShiftLocation.java @@ -200,8 +200,8 @@ public class OpenShiftLocation extends KubernetesLocation implements OpenShiftLo .withNewMetadata() .withName(deploymentName) .addToAnnotations(OPENSHIFT_GENERATED_BY, "Apache Brooklyn") - .addToAnnotations(CLOUDSOFT_ENTITY_ID, entity.getId()) - .addToAnnotations(CLOUDSOFT_APPLICATION_ID, entity.getApplicationId()) + .addToAnnotations(BROOKLYN_ENTITY_ID, entity.getId()) + .addToAnnotations(BROOKLYN_APPLICATION_ID, entity.getApplicationId()) .endMetadata() .withNewSpec() .withNewStrategy() http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/5a4f2e9b/locations/container/src/test/java/org/apache/brooklyn/container/location/docker/DockerJcloudsLocationLiveTest.java ---------------------------------------------------------------------- diff --git a/locations/container/src/test/java/org/apache/brooklyn/container/location/docker/DockerJcloudsLocationLiveTest.java b/locations/container/src/test/java/org/apache/brooklyn/container/location/docker/DockerJcloudsLocationLiveTest.java index dcb3324..f1d9c32 100644 --- a/locations/container/src/test/java/org/apache/brooklyn/container/location/docker/DockerJcloudsLocationLiveTest.java +++ b/locations/container/src/test/java/org/apache/brooklyn/container/location/docker/DockerJcloudsLocationLiveTest.java @@ -123,7 +123,7 @@ public class DockerJcloudsLocationLiveTest extends BrooklynAppLiveTestSupport { JcloudsSshMachineLocation machine = newDockerMachine(loc, ImmutableMap.<String, Object>of( JcloudsLocation.WAIT_FOR_SSHABLE.getName(), "1m")); - assertMachineSshableSecureAndFromImage(machine, "cloudsoft/centos:7"); + assertMachineSshableSecureAndFromImage(machine, "brooklyncentral/centos:7"); } @Test(groups = {"Live", "Live-sanity"}) @@ -133,11 +133,11 @@ public class DockerJcloudsLocationLiveTest extends BrooklynAppLiveTestSupport { JcloudsLocationConfig.LOGIN_USER, "myuser", JcloudsLocationConfig.LOGIN_USER_PASSWORD, "mypassword")); Image image = getOptionalImage(machine).get(); - assertEquals(image.getDescription(), "cloudsoft/centos:7"); + assertEquals(image.getDescription(), "brooklyncentral/centos:7"); assertEquals(templateOptions.getLoginUser(), "myuser"); assertEquals(templateOptions.getLoginPassword(), "mypassword"); assertEquals(templateOptions.getLoginPassword(), "mypassword"); - assertEnvNotContainsKey(templateOptions, "CLOUDSOFT_ROOT_PASSWORD"); + assertEnvNotContainsKey(templateOptions, "BROOKLYN_ROOT_PASSWORD"); } @Test(groups = {"Live", "Live-sanity"}) @@ -160,7 +160,7 @@ public class DockerJcloudsLocationLiveTest extends BrooklynAppLiveTestSupport { public void testMatchingImageDescriptionHasAutoGeneratedCredentials() throws Exception { loc = newDockerLocation(ImmutableMap.<String, Object>of()); JcloudsSshMachineLocation machine = newDockerMachine(loc, ImmutableMap.<String, Object>of( - JcloudsLocation.IMAGE_DESCRIPTION_REGEX.getName(), "cloudsoft/centos:7", + JcloudsLocation.IMAGE_DESCRIPTION_REGEX.getName(), "brooklyncentral/centos:7", JcloudsLocation.WAIT_FOR_SSHABLE.getName(), "1m")); assertTrue(machine.isSshable(), "machine=" + machine); @@ -174,7 +174,7 @@ public class DockerJcloudsLocationLiveTest extends BrooklynAppLiveTestSupport { JcloudsLocation.OS_VERSION_REGEX.getName(), "7.*", JcloudsLocation.WAIT_FOR_SSHABLE.getName(), "1m")); - assertMachineSshableSecureAndFromImage(machine, "cloudsoft/centos:7"); + assertMachineSshableSecureAndFromImage(machine, "brooklyncentral/centos:7"); } @Test(groups = {"Live", "Live-sanity"}) @@ -185,7 +185,7 @@ public class DockerJcloudsLocationLiveTest extends BrooklynAppLiveTestSupport { JcloudsLocation.OS_VERSION_REGEX.getName(), "14.04.*", JcloudsLocation.WAIT_FOR_SSHABLE.getName(), "1m")); - assertMachineSshableSecureAndFromImage(machine, "cloudsoft/ubuntu:14.04"); + assertMachineSshableSecureAndFromImage(machine, "brooklyncentral/ubuntu:14.04"); } @Test(groups = {"Live", "Live-sanity"}) @@ -196,7 +196,7 @@ public class DockerJcloudsLocationLiveTest extends BrooklynAppLiveTestSupport { JcloudsLocation.OS_VERSION_REGEX.getName(), "16.04.*", JcloudsLocation.WAIT_FOR_SSHABLE.getName(), "1m")); - assertMachineSshableSecureAndFromImage(machine, "cloudsoft/ubuntu:16.04"); + assertMachineSshableSecureAndFromImage(machine, "brooklyncentral/ubuntu:16.04"); } @Test(groups = {"Live", "Live-sanity"}) @@ -207,14 +207,14 @@ public class DockerJcloudsLocationLiveTest extends BrooklynAppLiveTestSupport { JcloudsLocation.WAIT_FOR_SSHABLE.getName(), "1m")); JcloudsSshMachineLocation machine = newDockerMachine(loc, ImmutableMap.<String, Object>of()); - assertMachineSshableSecureAndFromImage(machine, "cloudsoft/ubuntu:16.04"); + assertMachineSshableSecureAndFromImage(machine, "brooklyncentral/ubuntu:16.04"); } protected void assertMachineSshableSecureAndFromImage(JcloudsSshMachineLocation machine, String expectedImageDescription) throws Exception { Image image = getOptionalImage(machine).get(); assertEquals(image.getDescription(), expectedImageDescription); assertEquals(templateOptions.getLoginUser(), "root"); - assertEnvContainsKeyValue(templateOptions, "CLOUDSOFT_ROOT_PASSWORD", templateOptions.getLoginPassword()); + assertEnvContainsKeyValue(templateOptions, "BROOKLYN_ROOT_PASSWORD", templateOptions.getLoginPassword()); assertPasswordIsSecure(templateOptions.getLoginPassword()); assertTrue(machine.isSshable(), "machine=" + machine); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/5a4f2e9b/locations/container/src/test/java/org/apache/brooklyn/container/location/kubernetes/ImageChooserTest.java ---------------------------------------------------------------------- diff --git a/locations/container/src/test/java/org/apache/brooklyn/container/location/kubernetes/ImageChooserTest.java b/locations/container/src/test/java/org/apache/brooklyn/container/location/kubernetes/ImageChooserTest.java index cb041aa..7a863ae 100644 --- a/locations/container/src/test/java/org/apache/brooklyn/container/location/kubernetes/ImageChooserTest.java +++ b/locations/container/src/test/java/org/apache/brooklyn/container/location/kubernetes/ImageChooserTest.java @@ -35,32 +35,32 @@ public class ImageChooserTest { @Test public void testDefault() throws Exception { - assertEquals(chooser.chooseImage((String) null, null).get(), "cloudsoft/centos:7"); + assertEquals(chooser.chooseImage((String) null, null).get(), "brooklyncentral/centos:7"); } @Test public void testCentos() throws Exception { - assertEquals(chooser.chooseImage("cEnToS", null).get(), "cloudsoft/centos:7"); + assertEquals(chooser.chooseImage("cEnToS", null).get(), "brooklyncentral/centos:7"); } @Test public void testCentos7() throws Exception { - assertEquals(chooser.chooseImage("cEnToS", "7").get(), "cloudsoft/centos:7"); + assertEquals(chooser.chooseImage("cEnToS", "7").get(), "brooklyncentral/centos:7"); } @Test public void testUbnutu() throws Exception { - assertEquals(chooser.chooseImage("uBuNtU", null).get(), "cloudsoft/ubuntu:14.04"); + assertEquals(chooser.chooseImage("uBuNtU", null).get(), "brooklyncentral/ubuntu:14.04"); } @Test public void testUbnutu14() throws Exception { - assertEquals(chooser.chooseImage("uBuNtU", "14.*").get(), "cloudsoft/ubuntu:14.04"); + assertEquals(chooser.chooseImage("uBuNtU", "14.*").get(), "brooklyncentral/ubuntu:14.04"); } @Test public void testUbnutu16() throws Exception { - assertEquals(chooser.chooseImage("uBuNtU", "16.*").get(), "cloudsoft/ubuntu:16.04"); + assertEquals(chooser.chooseImage("uBuNtU", "16.*").get(), "brooklyncentral/ubuntu:16.04"); } @Test http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/5a4f2e9b/locations/container/src/test/java/org/apache/brooklyn/container/location/kubernetes/KubernetesLocationLiveTest.java ---------------------------------------------------------------------- diff --git a/locations/container/src/test/java/org/apache/brooklyn/container/location/kubernetes/KubernetesLocationLiveTest.java b/locations/container/src/test/java/org/apache/brooklyn/container/location/kubernetes/KubernetesLocationLiveTest.java index 6a30650..c9769f9 100644 --- a/locations/container/src/test/java/org/apache/brooklyn/container/location/kubernetes/KubernetesLocationLiveTest.java +++ b/locations/container/src/test/java/org/apache/brooklyn/container/location/kubernetes/KubernetesLocationLiveTest.java @@ -95,7 +95,7 @@ public class KubernetesLocationLiveTest extends BrooklynAppLiveTestSupport { @Test(groups = {"Live"}) public void testDefault() throws Exception { - // Default is "cloudsoft/centos:7" + // Default is "brooklyncentral/centos:7" runImage(ImmutableMap.<String, Object>of(), "centos", "7"); } @@ -126,18 +126,18 @@ public class KubernetesLocationLiveTest extends BrooklynAppLiveTestSupport { } @Test(groups = {"Live"}) - public void testCloudsoftCentos7() throws Exception { - runImage(ImmutableMap.of(KubernetesLocationConfig.IMAGE.getName(), "cloudsoft/centos:7"), "centos", "7"); + public void testCentos7Image() throws Exception { + runImage(ImmutableMap.of(KubernetesLocationConfig.IMAGE.getName(), "brooklyncentral/centos:7"), "centos", "7"); } @Test(groups = {"Live"}) - public void testCloudsoftUbuntu14() throws Exception { - runImage(ImmutableMap.of(KubernetesLocationConfig.IMAGE.getName(), "cloudsoft/ubuntu:14.04"), "ubuntu", "14.04"); + public void testUbuntu14Image() throws Exception { + runImage(ImmutableMap.of(KubernetesLocationConfig.IMAGE.getName(), "brooklyncentral/ubuntu:14.04"), "ubuntu", "14.04"); } @Test(groups = {"Live"}) - public void testCloudsoftUbuntu16() throws Exception { - runImage(ImmutableMap.of(KubernetesLocationConfig.IMAGE.getName(), "cloudsoft/ubuntu:16.04"), "ubuntu", "16.04"); + public void testUbuntu16Image() throws Exception { + runImage(ImmutableMap.of(KubernetesLocationConfig.IMAGE.getName(), "brooklyncentral/ubuntu:16.04"), "ubuntu", "16.04"); } @Test(groups = {"Live"}) @@ -166,7 +166,7 @@ public class KubernetesLocationLiveTest extends BrooklynAppLiveTestSupport { @Test(groups = {"Live"}) protected void testUsesSuppliedLoginPassword() throws Exception { - // Because defaulting to "cloudsoft/centos:7", it knows to set the loginUserPassword + // Because defaulting to "brooklyncentral/centos:7", it knows to set the loginUserPassword // on container creation. String password = "myCustomP4ssword"; loc = newKubernetesLocation(ImmutableMap.<String, Object>of()); @@ -184,7 +184,7 @@ public class KubernetesLocationLiveTest extends BrooklynAppLiveTestSupport { List<Integer> inboundPorts = ImmutableList.of(22, 443, 8000, 8081); loc = newKubernetesLocation(ImmutableMap.<String, Object>of()); SshMachineLocation machine = newContainerMachine(loc, ImmutableMap.<String, Object>builder() - .put(KubernetesLocationConfig.IMAGE.getName(), "cloudsoft/centos:7") + .put(KubernetesLocationConfig.IMAGE.getName(), "brooklyncentral/centos:7") .put(KubernetesLocationConfig.LOGIN_USER_PASSWORD.getName(), "p4ssw0rd") .put(KubernetesLocationConfig.INBOUND_PORTS.getName(), inboundPorts) .put(LocationConfigKeys.CALLER_CONTEXT.getName(), app)
